Merge change 26881 into eclair

* changes:
  Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.