Merge "Remove references to nonexisting classes" am: fda5ae6a78 am: b76237c6b7 am: 5677c83259 am: 1b5e52f83e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1958379

Change-Id: If1c039e1d07757afa6ceb5d6fc96b8ec6d36d1ad