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

Change-Id: Icaabfd74daa96f7a3f44be0996987d94789fbd06