Merge "fiemap_image_test: libcrypto_utils as static lib" am: f2554ab2ad

Change-Id: I5742d0a564a9a4afede94352226a238599a2f176