Merge "Remove unused Android.bp" am: fe7dedcf9d am: 4d6eccdcd2
am: 7c5d807a0a

Change-Id: If540435f77c03b378231f115ef2766d643704ae8