Merge "Pre-allocate necessary heap space with boot image."
am: fcefab5ecf

Change-Id: I5c8faa8e78782a84e51ba7dee2c8ae0dacd1a958