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

Change-Id: Ifb00977cf5fd243f890972cb35dc13d052c7471e