Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a
am: ff77b42d66

Change-Id: I0b071ffabf1456c84d7438cb1c6e13d53d012bf7