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

Change-Id: Idf541c27f776c68aeeea3cb89a9f4e3e74ccba73