Merge "Adjust forced dexopt in case of stripped APKs." into oc-dev am: 989618a48e
am: 09a95c85a9

Change-Id: Ibd6c929fb1316b35c421b8b81fe849c7e34db9e4