Merge "Disable dexpreopt for deployagent"
am: b42719bcd3

Change-Id: Id6c190730f028c3cbf7c29917640796fe8c29419