Merge change I6c84d731 into eclair-mr2

* changes:
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER