am 977b8414: am da4f30c5: Merge "Remove incompatible Unicode compatibility types."

* commit '977b84140f2314c244f32b2df0913abb0876532b':
  Remove incompatible Unicode compatibility types.