Merge "Rename preferCodeIntegrity to useEmbeddedDex"
am: 423be675eb

Change-Id: Ibb7bde4e6e3e85d4c82378f921d93419e1ccce1c