[automerger skipped] Merge "libfiemap: Remove brittle tests." into rvc-dev am:...
[automerger skipped] Merge "libfiemap: Remove brittle tests." into rvc-dev am: 7d50e969 am: bc141e00 am: 65783b19 -s ours
am skip reason: Change-Id I7be7d44dea81508505c050ed995b3b78086ad35f with SHA-1 3afca7c1 is in history
Change-Id: I3b80537c1c0a7682e61ce4b4f6be758e5706c423