[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 -s ours am: ec7d6da0 -s ours
am skip reason: Change-Id I103e0079ea5e54d0c5657ccb5db7c95adbda106c with SHA-1 6df89a6f is in history
Change-Id: Iea930268554f56b18fd2ae6fda1ff6f177cdcb58