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