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

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

Change-Id: Id72f26e0e1e88a3e6e376c2ad173e9436a224883