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

Change-Id: I0ed80b7d490da5d25aadef365dfb7f3388977f34