Merge "Add fiemap_writer_test to VTS." am: 9a62481fc7
am: 7dcb9f8bc8

Change-Id: I1d010bcf93afb889d64f52127105920ed1b5e053