Enforce visibility for internal libs. am: c6df5654d6
am: 26fe384e4a

Change-Id: Iec9d9da5c789b1049dcda9a0ec97b2bc2ef6562c