Merge "Add dependency to libbase"