Merge remote-tracking branch 'Quarx/cm11.0-2.6.32' into slim4.4

Conflicts:
	releasetools/jordan-common_ota_from_target_files.py