Merge "libfiemap: Add helpers to remove images from recovery." am: 8edafa2393 am: 7208d546ef

Change-Id: I47eb95360eea05f79a099eb5c54b31f2c5e2e8cf