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

* commit '17795736d25c5a99a683e4f00d02b2d72bb7003b':
  cpu_ref: fix c++11 narrowing violations