Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" am: 16d1603b81

Change-Id: I235f6d1c2fd9ada98f1eebba69ed0db1251b52d1