am 4d169121: Merge "Move more Class annotations to native."

* commit '4d169121fa7c09be2e4d314c1699c3639973ac49':
  Move more Class annotations to native.