Merge "Relax annotation visibility so runtime includes build." into nyc-dev
am: aec92c397e

* commit 'aec92c397e73b74187c8d517f6cf439ba6147f4d':
  Relax annotation visibility so runtime includes build.

Change-Id: Ifbc56bc5413780813d83377818f396663f75c270