Merge "bionic/malloc_iterate_test: Adjust callback for procinfo::ReadMapFile" am: cf6cec84 am: 761b215d am: bee2dda4 Change-Id: I383c9e7e91755f387a19ecb1329e3cb391654a62