[automerger skipped] Merge "bionic_unit_tests: Remove dependency on libpagemap" am: 122ecb1ca8 am: 306caa7df8
am: a5addb0aba -s ours
am skip reason: change_id Ice217a91a16ee0216354608b2776c0f1e5f65c09 with SHA1 e3f39a0efc is in history

Change-Id: I6d8aee0368ddd5b51de6029c7a5cd5c1f682b06b