Merge "Adjust forced dexopt in case of stripped APKs." am: 5669550a83 am: f59dd816b1
am: 8d76994c5b

Change-Id: I87acb3200de0e731eab78107d30c3c8999674c6d