Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android