Fix order of entries in thermal-engine-8226

Change-Id: Idcef6bff14a0b36591d7bbb40e5306c4cd316a73
Merge remote-tracking branch 'cm/cm-11.0' into kitkat
scripts: remove unused sensorsqcomwrapper.sh

Depends on I12557b9867c694c0bba8fee0475a814aef3d714e from
android_device_motorola_msm8960-common.

Change-Id: Ib82ddc3e15994b65fda70dd706d47d45b4a47eda
Merge "scripts: remove unused sensorsqcomwrapper.sh" into cm-11.0
scripts: remove unused qcamerasrvwrapper

Depends on I1742c262cc6969205ce2db0bfe806d45cfe4c6d5 from
android_device_motorola_msm8960-common.

Change-Id: Id28b81ae6e4b2ab210ea9d1d4c54d8f932796ed9

Conflicts:
	qcom-common.mk
Merge remote-tracking branch 'cm/cm-11.0' into kitkat

Conflicts:
	qcom-common.mk

Change-Id: I0b2f7ca9432a1665e36bd898f11ebfe04f21b57c