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

Change-Id: Id6c89984548aa261c4063f2cd1e90c2bc66f2074