Merge "bionic_unit_tests: Remove dependency on libpagemap"
am: 122ecb1ca8

Change-Id: I1114baa833ac601b32487303c3c848b5f27817c9