TARGET_OTA_TRASH_FILE! Dump that cruft but save the usable extras

Change-Id: I3f68ea492479e8a9288cf41622e60efa6e65650f