Merge "Handle exceptions when doing dexopt." into froyo