Merge remote-tracking branch 'cm/cm-10.1' into db42
qcom-common: Actually include 8930ab/8960ab thermald profiles in the build

Change-Id: I2692ccdece6cc5ee97744c7737350ec769f7a2eb