Merge commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17' into eclair-mr2-plus-aosp * commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17': Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.