am b7132738: am 7f4d4fc8: Merge "Fix benign overflow in ToneGenerator.cpp"

* commit 'b7132738e2e980f29fe67e863ac6b5488c0922b3':
  Fix benign overflow in ToneGenerator.cpp