Merge commit '195d08b5a1d93025464f7347280f182e5da7fda7' into eclair-plus-aosp * commit '195d08b5a1d93025464f7347280f182e5da7fda7': Fix bug 2172716. Align AudioPolicyManager code in msm7k/libaudio and msm7k/libaudio-qsd8k