Merge change 24179 into eclair

* changes:
  Support encoding amr-wb content in stagefright.