am: aec92c39 * commit 'aec92c39': Relax annotation visibility so runtime includes build. Change-Id: Ifbc56bc5413780813d83377818f396663f75c270