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

Change-Id: I2dc676049597e7b64fbe708ab71c5b3ccf19c72e