Merge branch linux-linaro-lsk-v3.10-android