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

* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
  Remove incompatible Unicode compatibility types.