Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz...