Extend the audio HAL interface to support get/set master mute

Hand merge from ics-aah

> Extend the audio HAL interface to support get/set master mute: DO NOT MERGE
>
> Extend the audio HAL interface to allow HALs to optionally support HW
> level master mute.  This follows the same pattern as master volume and
> is part of the fix for bug 6828363.  Because of the divergences
> between ICS and master, this change will need to be merged by hand.
>
> Signed-off-by: John Grossman <johngro@google.com>
> Change-Id: Ica6f5e37e13d13dde60463966f41f271ffa104fd

Change-Id: I5e7aea6d7da0012dcc077281f9077fc04cfb9889
Signed-off-by: John Grossman <johngro@google.com>
Merge "Extend the audio HAL interface to support get/set master mute"
Sync with jb-mr1-dev

Change-Id: Ib27348c1d11365771806a140e5fba06e2dd32cde
am 505dd32d: Sync with jb-mr1-dev

* commit '505dd32df510c25be9abb523e03042c89ffaee3b':
  Add multi-display and flip fence to HWC
am fefff86b: Revert "Add multi-display and flip fence to HWC"

* commit 'fefff86b905de3a3d898b38c4d478ccabe9761d9':
  Revert "Add multi-display and flip fence to HWC"
am 1f69919f: am fefff86b: Revert "Add multi-display and flip fence to HWC"

* commit '1f69919ffa9ffbf0633bc7766393d7717c599f5d':
  Revert "Add multi-display and flip fence to HWC"
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie13896fc0b2ee88acfea873eabe0baa520d88225
am 7ec18671: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7ec18671bb9e0ef463d42c10087a5b624a4c7eaa':
  Revert "Add multi-display and flip fence to HWC"
am ca383297: Camera2: Test logging changes

* commit 'ca383297ff9581c50ded2b7bb2a7c36f7c659716':
  Camera2: Test logging changes
am 695ff703: am ca383297: Camera2: Test logging changes

* commit '695ff70319b952b565c898b41debef3c026fd2fa':
  Camera2: Test logging changes
Reconcile with jb-mr1-release - do not merge

Change-Id: I6b06bd8fda70c906308525bd106c47da553e4e9b
am 1a242b6d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1a242b6dfb76fe141ed1e7c7e014e5a7cc0255a0':
am 18d30d64: Add multi-display and flip fence to HWC

* commit '18d30d64a6efaaf0871c28e772e4c440ae531d6d':
  Add multi-display and flip fence to HWC
am c2de824f: am 18d30d64: Add multi-display and flip fence to HWC

* commit 'c2de824f13c8f6d91334b4d494cd35417a0c6bab':
  Add multi-display and flip fence to HWC
am 788faa7f: Extend the audio HAL interface to support get/set master mute

* commit '788faa7f28add4e2c619776d26536892ecf0d4f4':
  Extend the audio HAL interface to support get/set master mute
am 992006f1: Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev

* commit '992006f19a5cd2e6bade28c20667b34d4d3b12c8':
  Simplify prepare and set semantics (comments only)
am 0c3bc086: am 788faa7f: Extend the audio HAL interface to support get/set master mute

* commit '0c3bc086c47565567d835b050e54d5dbad71f75c':
  Extend the audio HAL interface to support get/set master mute
am 08dbb044: am 992006f1: Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev

* commit '08dbb04422ef5fd2f5e5f84d5e55c10bc7e28fa4':
  Simplify prepare and set semantics (comments only)
Reconcile with jb-mr1-release - do not merge

Change-Id: I7c0399122deae2e64d6ea795f3e1722ec6e557d6
am d1976678: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd1976678886722081e899608e1ac91198019b54a':