Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people...