Merge "Drop the no-op Android.bp." am: 242d41b808 am: 2d62142fff
am: d2a24050da

Change-Id: I05a7b9c9d32121832acf0b8cafe982b63310d06c