Fix issues with private annotation hiding

When trying to run against AndroidX, I got an IllegalArgumentException because one visibility representation uses "" for java package visibility and the other uses "package". While updating the unit test for this I also realized inner annotation classes weren't being handled.

Test: Updated existing test with all possible visibilities and a nested class
Change-Id: I587d3aed825b062af60cb5fa89c0d05b1eea690e