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

Change-Id: I36e4d7cada8957337d66acc1953f379ef371f497