Merge "Revert "Avoid adding region space bitmap to heap bitmap"" am: c898aa8d28 am: a0ae8d8d24
am: cc2d5fb3d4

Change-Id: Ia7fc707d5515c6026c852d7d65f63c76f248cdb3