Merge branch 'jellybean' of https://github.com/CyanogenMod/android_device_hp_tenderloin into jellybean
Merge branch 'jellybean' into jb-camera
Revert to original CM device make file
add proprietary files to dependencies
Update device mk file and latest prebuilts
Merge branch 'jellybean' into jb-camera

Conflicts:
	device_tenderloin.mk
Merge branch 'jb-camera' of https://github.com/shumashv1/android_device_hp_tenderloin into jb-camera