Merge \\\"Convert libbase Android.mk to Android.bp\\\" am: df252716f6 am: 3407c053c3
am: c5ba0110d4

Change-Id: Idb8879e480eb176f437dbdb9fb82c0aaaa1b48f9