Merge "dexdiag: Replace libpagemap with libmeminfo"
am: fcea622316

Change-Id: I1bd6fd74bfd19bb10fe4fb693bb7247ef8bcfd0f