Merge "Merge VtsFiemapWriterTest into fiemap_writer_test" am: b5c0ad7b21 am: d4f2250049

Change-Id: Idbb340d58e9ad805dbdb004185810a73081625c0