Merge "Control use of dex2oat64 by device property" am: d656fe27e1 am: 2fa686812b

Change-Id: I099c366b8f278123ccbc3050dc7aca4e4ce52a3d