Reconcile with jb-mr2-release - do not merge

Change-Id: I153ed20781caef1f3098180e30bad056c0fbb114
am e96e51fb: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e96e51fbb55fd466bb2a21f77082a86cc7273b18':
  Bump apns version to 8
am 4dc85efa: Camera: Hotplug support as if it was sysfs

* commit '4dc85efabf08b5b700a6ec0c9b435b40334e72c4':
  Camera: Hotplug support as if it was sysfs
am 7dda9999: am 4dc85efa: Camera: Hotplug support as if it was sysfs

* commit '7dda9999ac011881ebf2945697930b7f10983417':
  Camera: Hotplug support as if it was sysfs
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic8fe3be7f6615acf2d7cfa455f4b5f518790d271
am 42d033d6: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '42d033d6eefad2bbc73c43bda1dc646335db81f9':
am 2de81ad1: Bare-bones emulated fake camera for HAL version 3

* commit '2de81ad1fbadb0b2dd26830f6bb97c19c783969f':
  Bare-bones emulated fake camera for HAL version 3
am 03a28bba: Camera3: Support for still capture

* commit '03a28bba9dcf5276cdf64408a648e1dddd2945ba':
  Camera3: Support for still capture
am 5e936df9: Camera2/3: Improve fake handshake

* commit '5e936df9ce247b8bd0964dabb4369ea45875c825':
  Camera2/3: Improve fake handshake
am e0400c69: Camera3: Trigger IDs now received from framework

* commit 'e0400c6914fb7b8ab4fbdcf9348ccb97b551a6e0':
  Camera3: Trigger IDs now received from framework
am 199f6026: Camera3: Allow register_stream_buffers while requests are in flight

* commit '199f6026e74e857fa7edbc3fe2cd78aebf94afc1':
  Camera3: Allow register_stream_buffers while requests are in flight
am 899e8921: Camera: Handle AF state transitions

* commit '899e89214055bed173e86b6c9e1113cd871f81c3':
  Camera: Handle AF state transitions
am 3ea24ef5: am 2de81ad1: Bare-bones emulated fake camera for HAL version 3

* commit '3ea24ef53b6e6089f596f83a7e1757fa896e7094':
  Bare-bones emulated fake camera for HAL version 3
am d8bdc96f: am 03a28bba: Camera3: Support for still capture

* commit 'd8bdc96fb62964700e60b43886f0f2537fade261':
  Camera3: Support for still capture
am 13b51477: am 5e936df9: Camera2/3: Improve fake handshake

* commit '13b5147730105e097ac2703c2a064d4294735667':
  Camera2/3: Improve fake handshake
am 0250c23e: am e0400c69: Camera3: Trigger IDs now received from framework

* commit '0250c23ef13b468436528fb90a15a3cd8fabbec2':
  Camera3: Trigger IDs now received from framework
am b4f53471: am 199f6026: Camera3: Allow register_stream_buffers while requests are in flight

* commit 'b4f53471fa4f9cfd8741095db41f508637c3e613':
  Camera3: Allow register_stream_buffers while requests are in flight
am d7a77c97: am 899e8921: Camera: Handle AF state transitions

* commit 'd7a77c979460e5d7117f79b53c18d454191beb33':
  Camera: Handle AF state transitions
am ccb311d2: Add liblog

* commit 'ccb311d23ac6aecea88155c6dc39e08f8994d853':
  Add liblog
am ad106cc0: am ccb311d2: Add liblog

* commit 'ad106cc08f231632a4af20b348e71c9703963837':
  Add liblog