Merge "Remove incompatible Unicode compatibility types."