Merge "Control use of dex2oat64 by device property"