Merge "Fix libbase's logging dependency."