Merge "Relax annotation visibility so runtime includes build."
am: a21decf759

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

Change-Id: I0ff243b03e0d872109fe6b064958bd4712b389fc