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

Change-Id: I9ca940ddf71dc1e33954fcf6429d53735145f6ff