Merge "Remove some unnecessary items from WellKnownClasses."
am: a9e0c71c82

Change-Id: I6afd13b642d2f5f0671bbb1595fae98bb85e0d5c