Merge "Rename libfiemap libraries."
am: 536dd4292e

Change-Id: I7c7c1d1152ec6b74c713f8c0fcbb2bd473a482d3