Merge "Remove references to nonexisting classes" am: fda5ae6a78 am: b76237c6b7

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

Change-Id: I39f2ea9691aca3e7429b90a1be2a839d55973e78