Merge branch 'android-hikey-linaro-4.1-topic-hikey' into android-hikey-linaro-4.1

Pull in a few extra thermal fixes.

Signed-off-by: John Stultz <john.stultz@linaro.org>