am b7382afd: am 6e524ddc: Merge "Make dex2oat heap size product configurable [art]"

* commit 'b7382afdf02ba80e1c6fe21be73d3736b7b1dd40':
  Make dex2oat heap size product configurable [art]