Merge branch 'linaro-android-3.10-lsk' of