Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'