Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"