Merge "Fix cpu-info/cpp-defines mismatch."
am: 475a05e03a

* commit '475a05e03a7fff101f0b2e97e20a7079e00cc3ec':
  Fix cpu-info/cpp-defines mismatch.