Merge "Fix dexopt dump"