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

Change-Id: Ia7b88a586bb06ba3a86db7afc65eb38b8cf82241