Merge "Fix cpu-info/cpp-defines mismatch."