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

Change-Id: I973ba227faa1f8c82697826a078480981812db24