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