Merge "regenerate Android.bp files"
am: 5d9e4d5b48

Change-Id: I5e24dfd81836f531b9896e73c02501bfad9b1e49