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

* commit 'a01ea93dc0c11050733d23c6e308aa9b7fa5f622':