Merge "Otapreopt: Check dexopt return status before retry" am: dfdc1559f2  -s ours am: f681bb656e am: 7f4cb69c62
am: 744918b7ca

Change-Id: I1394693f30fc651c59103c69819eba1a6fa5fee7