Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android