Include package private classes referenced from public API
am: 8244ac42be

Change-Id: I1b3f11f12c70936b27c614f1568697ac8d6a8063