Merge "Rename libfiemap libraries." am: 536dd4292e
am: cddb335ac6

Change-Id: I9fe4e6cb751a8d94d9c4d0d37a419ae664cf4808