Revert "Fix build: Make an internal class package private"

This reverts commit 83a3538a18c22fb8bb448258cd85c99c384d1bab.

Change-Id: Iafcdfac416615454a1daf011c700f456885cf44a
1 file changed