Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp * commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c': Support encoding amr-wb content in stagefright.
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp * commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c': Support encoding amr-wb content in stagefright.