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