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

Change-Id: Ib7893136a0248d89c6375b25178c403cdf18ae6d