Merge "libfiemap: Add a test case for larger block size filesystems." am:...

Merge "libfiemap: Add a test case for larger block size filesystems." am: e7bc3e37 am: 4725998d am: 8563c77c am: 268b7102

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2157716



Change-Id: I1e9ca11655cf32e1089d5016515184744d370092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>