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

* commit '16a433aaeaf2d0eb8c10f46ff8a4ada521656c33':