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