am 6febe17c: Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev

* commit '6febe17ce31636d07ef6305cf1045a0b942b4f11':
  AudioFlinger: Better handling for master volume/mute