Merge "Skip DexoptDex2oat64Enabled on 64bit-only builds."