am 8ce250da: Merge "Move more Class annotations to native."

* commit '8ce250da6585bedc09e278968da27462fe895cde':
  Move more Class annotations to native.