Merge \"Merge \\\\"Convert libbase Android.mk to Android.bp\\\\" am: df252716f6 am: 3407c053c3 am: c5ba0110d4\" into nyc-mr1-dev-plus-aosp
am: 6c3eeb09c6

Change-Id: Ib953bf20e04351c8aaf349dc9c984d5b624dd860