Merge remote-tracking branch 'linaro-ext/android-hikey-linaro-4.1' into android-hikey-linaro-4.1