[automerger skipped] Merge "Control use of dex2oat64 by device property" into rvc-dev am: 49c39f2f8d am: 4617a564a7 -s ours am: 3b1ac06d0d -s ours am: 9797d80f09 -s ours

am skip reason: Change-Id I103e0079ea5e54d0c5657ccb5db7c95adbda106c with SHA-1 4d5ef28327 is in history

Change-Id: Ica043aaf0d8909de8eaceea70ebb849dc9f42322