Merge "Revert^2 "Add the "--ignore-dexopt-profile" option."" into main