Merge "Move hiddenapi to ClassAccessor" am: 921e517105
am: ce7e451093

Change-Id: Ie585ba96931e832992ccf2c365fdc31feb84f9c4