Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36