Merge "Avoid adding region space bitmap to heap bitmap"
am: 7616adcf93

Change-Id: I0b7e95441241c8df1b356b14b7243002a53535f0