Merge "Add explicit dependency on libbase"