Merge "Replace CountOneBits and __builtin_popcount with POPCOUNT."