Reconcile with jb-mr2-release - do not merge

Change-Id: Id7784bb61428b43fb622db1172b66f402eebe2df
am 4325b9f9: am 4e7469c4: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '4325b9f9d9b03a4c30c2570ba9e5fb417d1daa4b':
  DO NOT MERGE JAPAN(440,441): 110,118,119,112,911
  mako: wifi: Channels blocking in no service - do not merge
am 2cbcbb45: Rename AOSP builds to aosp_*

* commit '2cbcbb45f1e4d2b46d5660d9a8ee2a45f377eef1':
  Rename AOSP builds to aosp_*
am 1e73dcf3: Merge "auto-generated blob list" into jb-mr2-dev

* commit '1e73dcf3ccb90306fe86cd3e5185b0951f73eaaa':
  auto-generated blob list
am 6f478662: audio: enable loading ADSP image during bootup

* commit '6f4786627ec08cf3e32d6ce266c4421750bf6f8c':
  audio: enable loading ADSP image during bootup
am 57d1b6c2: Merge "Mako: NFC: Modify config file to work with new stack." into jb-mr2-dev

* commit '57d1b6c2fd4f2fd000c5d69b7ed5efd73fc97143':
  Mako: NFC: Modify config file to work with new stack.
am 6d016457: mako: move camera HAL from hardware/qcom/camera, DO NOT MERGE

* commit '6d01645739c75116d8940772b80d5b7aba5c39d6':
  mako: move camera HAL from hardware/qcom/camera, DO NOT MERGE
am 2123364f: Merge "auto-generated blob list" into jb-mr2-dev

* commit '2123364f7a71533d42078c953be0558ade28cb29':
  auto-generated blob list
am 98536c61: Disable device specific camera.

* commit '98536c61b80e2b0c25968d320eb8e69e4ddb8847':
  Disable device specific camera.
am 3d4d689d: Revert "Disable device specific camera."

* commit '3d4d689d3ff6006f9c91fba35ba76ba155a7cd15':
  Revert "Disable device specific camera."
Reconcile with jb-mr2-release - do not merge

Change-Id: Ie9468081f3c3f4d05316f13794cd41d52ff521d7
Reconcile with jb-mr2-release - do not merge

Change-Id: I7466882c8312784a2b81935501434cd13dd2c662
am c42d1549: mako: remove unused package alsa.msm8960

* commit 'c42d1549e743dfccd29b8eab1879cee20184f7d7':
  mako: remove unused package alsa.msm8960
am e1b7aca7: Merge "usb: acm: add hsic transport name as serial_hsic" into jb-mr2-dev

* commit 'e1b7aca752e7f0da13117b578b6eb51a17f53b67':
  usb: acm: add hsic transport name as serial_hsic
am 82d76819: Mako: NFC: Set delays for power on and reset.

* commit '82d768193d68fb195d943d396152330df1611dd9':
  Mako: NFC: Set delays for power on and reset.
Reconcile with jb-mr2-release - do not merge

Change-Id: I5b19656a1b7b45ac21573bdbc1c8f13b22792c45
am dea94d43: diag: Drop world rw permissions for /dev/diag

* commit 'dea94d4350bd5e975bd9580fd50cfa8dbd23eb95':
  diag: Drop world rw permissions for /dev/diag
am d9b7d9a3: qseecom: Drop world rw permissions for /dev/qseecom

* commit 'd9b7d9a313165f120ac073bd14e38b36b59b66c8':
  qseecom: Drop world rw permissions for /dev/qseecom
am 55794430: Revert "qseecom: Drop world rw permissions for /dev/qseecom"

* commit '55794430676922e8b3e96b80f33c16412788df80':
  Revert "qseecom: Drop world rw permissions for /dev/qseecom"
am 731f9bc8: Revert "diag: Drop world rw permissions for /dev/diag"

* commit '731f9bc85bb43e98e312a99deb3f9d83ee9c6816':
  Revert "diag: Drop world rw permissions for /dev/diag"