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

Change-Id: I3f3a130059f0f878f2c84b368a2f12cc86076b67