Merge pull request #1 from klin1344/jb-4.2

Import and use msm8960 camera HAL
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_htc_msm8960-common into jb-4.2
Merge pull request #2 from klin1344/jb-4.2

More camera HAL updates
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_htc_msm8960-common into jb-4.2
Merge pull request #3 from klin1344/jb-4.2

add videodev2.h header plus some audio fixes
liblights: fix notification LED on non CM-based firmwares
msm8960-common: enable mtp usb connection type

Patch set 1: initial
Patch set 2: allow for distinct mtp and mtp+adb product ids and remove infeasible combination mtp+mass_storage

Change-Id: I4812489313ddfbd85d691b7cfce4b23db3a8031e
Merge pull request #4 from klin1344/jb-4.2

Fix notification LED, enable MTP USB connection
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Conflicts:
	liblights/lights.c

Signed-off-by: travp624 <travp624@gmail.com>
Merge pull request #5 from jrior001/jb-4.2

merge in newer updates from CM and commits for evita
move overlays to vendor_baked