Merge "Fix Android.bp formatting" into main am: d51c6c799f

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3344457

Change-Id: Ieb6a59d320445523caa6771b039b8b7de5aa5f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>