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

Change-Id: If9e3207b9614cbb683cfe81b0a37eb5653fe19f9