This reverts commit e036dbc8eb7d5fdd02dc70faff20e9ac3e2989ca.
Upstream took __builtin_clz in use (in the new header
libFDK/include/x86/clz_x86.h, together with an alternative
implementation for MSVC), so this change can be dropped to
minimize the differences.