am 4cc3c4d3: Merge "cpu_ref: fix c++11 narrowing violations"

* commit '4cc3c4d3f4b6625cccbc83b4bd014f8129b103a4':
  cpu_ref: fix c++11 narrowing violations