Merge "Disable dexpreopt for deployagent" am: b42719bcd3
am: 2494a66c37

Change-Id: I878d824bfd54a50eab144cafb8687be343ed110b