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