am df9879bf: am e9bd4788: Merge change 26881 into eclair

Merge commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd'

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