Merge "libfiemap: Add helpers to remove images from recovery."