Merge "Remove dependency on CalHas.mk."