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"
am 505dd32d: Sync with jb-mr1-dev

* commit '505dd32df510c25be9abb523e03042c89ffaee3b':
  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"
am 7ec18671: (-s ours) Reconcile with jb-mr1-release - do not merge

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

* commit '695ff70319b952b565c898b41debef3c026fd2fa':
  Camera2: Test logging changes
am 1a242b6d: (-s ours) Reconcile with jb-mr1-release - do not merge

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

* commit 'c2de824f13c8f6d91334b4d494cd35417a0c6bab':
  Add multi-display and flip fence to HWC
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)
am d1976678: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd1976678886722081e899608e1ac91198019b54a':
am 9f0c8e56: am c6e29402: Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs

* commit '9f0c8e564997368945aad0eb563a9c56bcb16fdf':
  Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs
am b8bf772a: am 40478c72: Merge "Enhance keymaster tests" into jb-mr1-dev

* commit 'b8bf772acac545629200ecdcedefe03ab69d4611':
  Enhance keymaster tests
am 8da1fcd7: am a7571d29: am 42a70b67: Merge "Enhance keymaster tests"

* commit '8da1fcd7a49df5ea8262bfc28343864c5ff5cc16':
  Enhance keymaster tests
am 5274acb0: am df26a1dd: Merge "Enhanced bluetooth HAL with DUT mode APIs" into jb-mr1-dev

* commit '5274acb005d27bc4eed653853c3cff2683140148':
  Enhanced bluetooth HAL with DUT mode APIs
am 0165e51e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0165e51e46f034c238fb9c9520928b88b773bdc9':
am 744e1000: am 9affae6f: hwc: update blank documentation to specify that blank is synchronous

* commit '744e100010b27d337c2c862f0acd0c67faf21baf':
  hwc: update blank documentation to specify that blank is synchronous
am d4f9451b: am ab128b9f: Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-dev

* commit 'd4f9451b06882479e82e0fe6b12b61cb86a29632':
  HWC 1.1: add FRAMEBUFFER_TARGET layer type
am 781f1747: am f82c6417: Define HWC_DEVICE_API_VERSION_1_1

* commit '781f1747b62a67e5efae99343a459f50d996337c':
  Define HWC_DEVICE_API_VERSION_1_1
am 49c88288: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '49c8828832705c7ab5462021201c81d59ce8f7e0':