Merge commit '255bdedb2d7ebf4b14690776ff652df1de97fe95' into eclair-plus-aosp * commit '255bdedb2d7ebf4b14690776ff652df1de97fe95': Fix issue 2243808: Audio input routing broken.