Merge "Remove libbase's trivial libutils-headers dependency."