Merge "Revert Android.bp changes." am: 013fa056bb am: 4f2d030336 am: 8e025ea155 am: 1f4b4548bc

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

Change-Id: I055077b0007680eb928d2886caf04fd7f2acaef0