Merge "Add more filesystem support to libfiemap_writer." am: 79a43cf135
am: 90c7e99998

Change-Id: I15c3870f7d6c8c705daec0465c94c069e5df4351