Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common