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

Change-Id: I17b4c64bc6acb0f24a8829f02249b1617a6bbbcf