Merge "Add explicit dependency on libbase"
am: 3435f8c3fa

Change-Id: I7f1d052dc638547ac07005c39789998167b85f09