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

Change-Id: I0535dea8e268777bb3a81d93d1bf8cbec71ffae7