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

Change-Id: I49edacb420e0495006296f6a3f53ab84f63a7025