Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android