Merge "fs_mgr: Fix __ANDROID_RECOVERY__ usage in libfiemap." am: 7a5379d0e1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1978057

Change-Id: Iae8e78f35747ecbf8d8fd6f20c773ce386e3f16c