Merge "Allow fiemap_writer_test to run in arbitrary directories."
am: e99564fc62

Change-Id: I90dd03e7a6e6a6916c2b3d1d1866a944cc097345