Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
am: 3de875019e

Change-Id: I570bcf56e7b971b452007eb8db1ce6f13066ce05