am 952f6bf8: (-s ours) am 3f0b1eaa: Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev

* commit '952f6bf80858c1ef3543d9b93fa04a5a175f2026':
  Change audio flinger to user HAL master mute if available