Merge "Fix clz implementation for types with size < 4 bytes."