Merge "Add dalvik.vm.dex2oat-flags for eng build"