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

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

Change-Id: I3f5acd25c0c91c1d817d56dbbee04a77f3fe795a