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

Change-Id: I11871e75179ec64bd30fe23d6bcb40765ce6c64b