Merge commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5' into eclair-mr2-plus-aosp * commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5': Patch from HTC: changes in libaudio