Merge branch 'linux-tegra' into android-tegra