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

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

Change-Id: I39baae90f17037191b05b87c8e0c6ae48df58d38