Merge "Allow non word aligned heap limit for space bitmap"
am: 30a5d19f98

Change-Id: I050b553ca6275b53adb0dbfc89c417390d43ca7d