[automerger skipped] DO NOT MERGE: Rename dex2oat profile file to be Arm/Arm64...
[automerger skipped] DO NOT MERGE: Rename dex2oat profile file to be Arm/Arm64 specific am: 24bd8873
am: 025827dd -s ours
Change-Id: I653edea49032333d891a014cadfbb31dfb5efb08