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

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