am b5f7abcd: Merge "Revert "Revert "Move annotations to native."""

* commit 'b5f7abcdef9aec80e67b581a9bcc0de39e98fc85':
  Revert "Revert "Move annotations to native.""