Revert "Revert "Move annotations to native.""

This reverts commit da72c1301de9b5be5c23303ce092b333924d7db1.

Change-Id: I3b7d2b773964febf50125925633789132bdce541
4 files changed