Merge "Add dependency on libbase."