am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah

* commit 'c43a685c3027791b21294a2ef423a6129cb49ad4':
  Change audio flinger to user HAL master mute if available: DO NOT MERGE