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

Change-Id: I0e6c238430026659e0ea43a4004233fd2cb8f185