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

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