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

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

Change-Id: I4007ab5520c543e5c6384c8ada0eec5dd6a59498