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

Change-Id: I9c8ad0a79b9706d3ffa45121b5bd5d65c08e160e