am 1da16ceb: am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"

* commit '1da16cebe65b859a5cbd961a0667267393cb333b':
  Use current max product dalvik.vm.heapsize as default dex2oat heap size