Merge "Revert "Avoid adding region space bitmap to heap bitmap""