Bug897300: Correct mis-merge for pulse audio on Aurora from bug 886886 r=padenot a=bajaj