Merge branch 'android-3.10' into android-tegra-3.10