Merge "Merge "Adjust forced dexopt in case of stripped APKs." am: 5669550a83 am: f59dd816b1 am: 8d76994c5b" into oc-dev-plus-aosp
am: 1b136cb021
Change-Id: Ie0699b404d5cab4de712f89d2d14894ee2ff08ed
This commit is contained in: