Merge "Remove unused Android.bp"
am: fe7dedcf9d

Change-Id: Iebf77e285a11101b1d092ab20c3ad9c24da2dcc4