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

* commit '7f4d4fc853f03a8d2265d2b851736eb917e82730':
  Fix benign overflow in ToneGenerator.cpp