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

* commit '90b12ecd84e39a37ffd7553291ad779aeb6d76cf':