am ed6d3307: Set max heap size to 32MB. Bug #3103119

Merge commit 'ed6d3307de029ce2555cdab0cf96b1e0064eda4e' into gingerbread-plus-aosp

* commit 'ed6d3307de029ce2555cdab0cf96b1e0064eda4e':
  Set max heap size to 32MB.