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

Change-Id: I559a53b9125905838e997b32fe75a9cc3976a231