Merge "Revert Android.bp changes." am: 013fa056bb

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

Change-Id: Ibc738e08e10ca60899e42e161994464d9471925e