Clean up Android.bp files. am: 5926f502c4 am: 339938ca5c

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

Change-Id: Id8b2d6eea183d50a6c31a676611b46876b2b0e91
Signed-off-by: Automerger Merge Worker <[email protected]>