Restore 0f3e4da9 for jss15j release

Change-Id: Ib2f164c37a380b4d46964dcb5b495bdf66958af2
am b71960da: flo: wifi: Use -puse_p2p_group_interface=1 for wlan0

* commit 'b71960da07a8c841dd821572e0bfca2f831a49b3':
  flo: wifi: Use -puse_p2p_group_interface=1 for wlan0
am e9a0464e: flo: dumpstate: switch to HAL static lib

* commit 'e9a0464ed005114df83fdaf73683383edd3a747b':
  flo: dumpstate: switch to HAL static lib
am 32faee3c: flo: dumpstate: Add emmc maker and capacity for debugging

* commit '32faee3cd11c92a0fa31f7b39e010fdc463c1f72':
  flo: dumpstate: Add emmc maker and capacity for debugging
am 9655ed71: Make the remote submix audio module available.

* commit '9655ed71a101c12331f4c170d8cfe99929e9f75d':
  Make the remote submix audio module available.
am 78f015f0: Add flp.msm8960.so and dependencies, move gps.conf

* commit '78f015f02ff0696955550ca5a2ca97201f35e2c6':
  Add flp.msm8960.so and dependencies, move gps.conf
am f795cda4: flo: wifi: Fix P2P processing

* commit 'f795cda4ff32233e0728784b0b8ba8d8ca00edea':
  flo: wifi: Fix P2P processing
am 003c266d: flo/deb: enabled TZ-based keymaster HAL implementation

* commit '003c266dc00106fd4e745d55077000f55334ec19':
  flo/deb: enabled TZ-based keymaster HAL implementation
am 9f908b8d: Merge "flo: wifi: Override control iface to leave it to global" into klp-dev

* commit '9f908b8dffe5e6544903f5118704498ef35ec464':
  flo: wifi: Override control iface to leave it to global
am 16b30227: Add touch firmware version to bugreports

* commit '16b302276f99fe35e1f58f0fd043d195e50800c3':
  Add touch firmware version to bugreports
am dcf27fbf: Flo: NFC: Route IsoDep to the host by default.

* commit 'dcf27fbf2951276d39914c00cf2d4d742c86bca3':
  Flo: NFC: Route IsoDep to the host by default.
am f0579f58: flo: update egl.cfg

* commit 'f0579f58c617347cce6db0bc360e6dfd6545464a':
  flo: update egl.cfg
am 078b1f1f: Merge "Enable richer SD card permissions." into klp-dev

* commit '078b1f1f0acf9b30a7fed5a6911c917f2e96ea13':
  Enable richer SD card permissions.
use the default recovery UI

The key handling we use for flo is now the recovery default; we no
longer need a subclass of ScreenRecoveryUI.

Change-Id: I9976d2fe58670c7ddc8ab88421fce24a56253f40
Merge "use the default recovery UI"
am 2ee4fc77: Merge changes I01952429,Idd9c23f0 into klp-dev

* commit '2ee4fc7762c0da517bb2a8b70914125bedf5982a':
  flo: enable background WiFi scanning
  flo: update WCNSS_cfg.dat
am 46a7ede1: Merge "Patch up BTIF_HF_SERVCIE_NAMES array to match its length" into klp-dev

* commit '46a7ede132b5e2935c8bdff442682b7cc56b3785':
  Patch up BTIF_HF_SERVCIE_NAMES array to match its length
am 11a4b5c7: flo: clone of hardware/qcom/camera

* commit '11a4b5c79df5f832d512e0da94d596380c319dbc':
  flo: clone of hardware/qcom/camera
am 54dca38d: flo: enable device-specific camera

* commit '54dca38d9621c0c21f01356a7fd2da5c15a0d7fc':
  flo: enable device-specific camera
am 39415dc5: Merge "flo: init: change owner of kgsl/proc debugfs directory to system" into klp-dev

* commit '39415dc517e95102203f67ab2c80851e5040d1f4':
  flo: init: change owner of kgsl/proc debugfs directory to system