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

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