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

Change-Id: Ie9e2684c451d6591f5778ad320a8d534331ba557