Merge "cutils: Add bitmask utilities to bitops"