am 8ef1e64a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8ef1e64a5a6cd10fb4087394608a94db1ee83dde':
  mako: disable WiFi background scan
  mako: disable WiFi roaming
  Revert "mako: enable WiFi roaming"
  mako: termal: change thermal.conf
  Set Radio Scanning time to 9 seconds
  audio: set android resampler to VERY_HIGH_QUALITY
  mako: relocate ramdisk to avoid overlap with kernel
  mako: disable standalone power collapse
  mako: Updates to the prima wlan driver runtime configuration
  mako: add fast autofocus configuration
  mako: adjust vibrator amplitude
  Reinstante diag_mdlog, keep it disabled
  mako: bump up lowest brightness setting
  mako: adjust first brightness range's max value
  mako: remove /data/misc/wifi/WCNSS*.bin on boot
  wlan: Update WCNSS_cfg and NV that corresponds to RIVA 1.2
  mako: adjust backlight values in auto brightness mode
  Bring back ADB_EXTERNAL_STORAGE.
  Revert "Enable diag_mdlog on device logging service by default"