Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/libhardware_legacy into 1.1

Android 4.2.2 release 1
fmradio: cleanup QCOM_FM_ENABLED/STE_FM defs and ifdef

Change-Id: Ia34dca04e6b9de3509987ad9d88a5fecc3820e2f
wifi: add suport for WIFI_EXT_MODULE

Some wifi modules have dependencies on others (for SDIO, usually).
Use WIFI_EXT_MODULE_PATH to specify such dependencies

Change-Id: Ie8e746c1e69712be78d420d8e8ae8b015564a03d

Conflicts:

	wifi/wifi.c

Change-Id: I3fbc0065f76d91d170fb562159ea326caa4f3345
qcom-fm: audio: add support for FM feature

-Add set_fm_volume() to set handle fm volume

Change-Id: I2a2c6a60b9855d9360ff8fb90849517e77e5faab

Conflicts:

	audio/AudioPolicyManagerBase.cpp
	include/hardware_legacy/AudioSystemLegacy.h
wifi: add a new "loading" state

Set wlan.driver.status to "loading" in wifi_load_driver to allow
external action being triggered by property change.

Change-Id: Ia4363de4c4e0e1a1c4759f5699fd5ea6e1bc3182
Primary output check for sonification is removed.

- When there are 3 different tracks (Ringtone, Music and Touchtone)
   the device switch happens for touchtones to primary if the primary
   output is active. This can lead to music being played in combo
   due to timing issue.
 - This is mainly because we have a check for, primary output if
   active we return true for SONIFICATION. This will set SONIFICATION
   for touch tones and this device switch will come after music device
   is set.
 - Hence music will start playing as SONIFICATION.
 - We have removed the primar output check for getting device strategy

Change-Id: Ibe2c381a887a49ea8b776fb2148f38b61532d021
CRs-Fixed: 456842
libhardware_legacy: Increase stream mute time

- Increase the stream mute time to avoid audio glitches
  while switching between combo devices.

Change-Id: I8b47e6e8b977b1025310fd2b16b452a6c11005bd
CRs-Fixed: 448577
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_hardware_libhardware_legacy into jb-devel