Add persist=MTP to default to MTP
Merge commit 'refs/changes/38/29838/11' of http://review.cyanogenmod.org/CyanogenMod/android_device_hp_tenderloin into jb-camera

Conflicts:
	libsensors/MPLSensor.cpp
	libsensors/nusensors.cpp
	libsensors/sensors.c
Merge branch 'jb-camera' of https://github.com/shumashv1/android_device_hp_tenderloin into jb-camera

Conflicts:
	libsensors/MPLSensor.cpp
	libsensors/nusensors.cpp
	libsensors/sensors.c