Merge "Disable dexpreopt for deployagent"
am: 6aec073a8b

Change-Id: Id6c190730f028c3cbf7c29917640796fe8c29419