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

* commit '9977b476093bdfe4fdd2e11855ebf1079af12bea':
  Fix benign overflow in ToneGenerator.cpp