[automerger skipped] Merge "Control use of dex2oat64 by device property" into...
[automerger skipped] Merge "Control use of dex2oat64 by device property" into rvc-dev am: 49c39f2f am: 4617a564 -s ours am: 3b1ac06d -s ours
am skip reason: Change-Id I103e0079ea5e54d0c5657ccb5db7c95adbda106c with SHA-1 4d5ef283 is in history
Change-Id: Ife1002e6be1f39a0a8578ff83a0759fef1725b99