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

Change-Id: If41af16abab0e193fcfef6a939f039a4f24a38ef