Clean up Android.bp files. am: 5926f502c4 am: 339938ca5c am: 387b06403d am: 35c860c632

Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/2214081

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