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

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

Change-Id: I00b5e6536511b3bedee6105bf010ee2b5f2e36ac
Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_system_core into mr1.1-staging
Merge "fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef" into cm-10.1
Merge pull request #8 from CyanogenMod/cm-10.1

Cm 10.1