Merge "Revert "Revert "Avoid adding region space bitmap to heap bitmap""" am: 8d3ab9c0b9
am: 5d83ce8fc8

Change-Id: I700d3a1c0d6eb2dc6c3e5b1126ef3f5d7780565e