Sync with jb-mr1-dev

Change-Id: Ib27348c1d11365771806a140e5fba06e2dd32cde
am fefff86b: Revert "Add multi-display and flip fence to HWC"

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

Change-Id: Ie13896fc0b2ee88acfea873eabe0baa520d88225
am ca383297: Camera2: Test logging changes

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

Change-Id: I6b06bd8fda70c906308525bd106c47da553e4e9b
am 18d30d64: Add multi-display and flip fence to HWC

* commit '18d30d64a6efaaf0871c28e772e4c440ae531d6d':
  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)
Reconcile with jb-mr1-release - do not merge

Change-Id: I7c0399122deae2e64d6ea795f3e1722ec6e557d6
am c6e29402: Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs

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

* commit '40478c722cc63eb96f04945646608c867d842111':
  Enhance keymaster tests
am a7571d29: am 42a70b67: Merge "Enhance keymaster tests"

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

* commit 'df26a1dd79af85c41ae7edb37506ccffcb3e9bb5':
  Enhanced bluetooth HAL with DUT mode APIs
Reconcile with jb-mr1-release - do not merge

Change-Id: I5aeced4f5a3183ec2acf09356d43087857da634b
am 9affae6f: hwc: update blank documentation to specify that blank is synchronous

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

* commit 'ab128b9ff63602f4cd9c67a22edfa39ddfb5a3e9':
  HWC 1.1: add FRAMEBUFFER_TARGET layer type
am f82c6417: Define HWC_DEVICE_API_VERSION_1_1

* commit 'f82c6417f5bd728105b0ceac6dcba28072ef79a4':
  Define HWC_DEVICE_API_VERSION_1_1
Reconcile with jb-mr1-release - do not merge

Change-Id: If63c17a08e92cffdb9fdab5e62b1bcaff4673232
am aeba17d2: Add NUM_DISPLAY_TYPES query and refine display list semantics

* commit 'aeba17d23a88be34abfecd9550e4f4269f0bbf00':
  Add NUM_DISPLAY_TYPES query and refine display list semantics
Reconcile with jb-mr1-release - do not merge

Change-Id: I4d7f5e333a41b90f6e25ecf90157909830b1c27d