Merge "Merge "Adjust forced dexopt in case of stripped APKs." am: 5669550a83 am: f59dd816b1 am: 8d76994c5b" into oc-dev-plus-aosp