am a202251c: am 5087b2ea: am 9e5f302b: Merge "Change default heap maximum size to be 256m."

* commit 'a202251cb50bcc0a6c9f8174e4858dcc987b587e':