am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit 'ce75618e12deebe302c551281ce56c0d60138e0f':
  Make dex2oat heap size product configurable [frameworks/base]