Bug 11291911
These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)
Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5