am 3c2559ea: Merge commit \'c0ff7762509131a5a95ee258fa6da881a23100a6\' into HEAD

* commit '3c2559ea1672acfa17e64bfece1cc3c2dcd636aa':
am b8fada87: Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"

* commit 'b8fada8742caed088c4d9f18353c557255701d2f':
  wifi: Link libwpa_client only if wpa_supplicant was chosen
am cf68701c: Merge commit \'9d3950389b53452338fab25f2255623ac159b259\' into HEAD

* commit 'cf68701c3952cc2e6e258005e3cf9e38fe107ede':
am 84b5cd7c: Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '84b5cd7cded812398aaef8274ecacf0c3bd1907e':
  hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
am c32be36f: Merge "wifi: check if supplicant is running before starting it"

* commit 'c32be36fd0981685cc9c33d32ae9babc466e6ae2':
  wifi: check if supplicant is running before starting it
am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"

* commit 'eaf44380422a9d78b0a56a05ab3742dbeee79dd5':
  Wi-Fi HAL: fix supplicant start failed issue
am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"

* commit 'be39c1e4cc6b635013553684953d1048d1599a8e':
  audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
am 60089828: Merge "Audio policy is 32-bit only"

* commit '600898287d579c41b77af309f0ab75dbe40c559b':
  Audio policy is 32-bit only
Merge commit '50a76b9727c876405e59d61e082b4be0abebab4b' into HEAD
am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"

* commit '8eb3354ad06cc4f24375d076698b35d2c26f0e90':
  Audio: add an openOutputStreamWithFlags API
am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."

* commit '9739aeb214087ef5dc0cfe7e4bd5f87904cefb92':
  Indicate WPA_EVENT_TERMINATING event on primary interface.
am a5b275c3: Merge "Changes to restart supplicant on crash"

* commit 'a5b275c3c64a718321f0731c49a338c6775f4273':
  Changes to restart supplicant on crash
auto-merger: merge in from aosp/master