Merge "Remove unused -I of external/safe-iop."