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