Merge remote-tracking branch 'android-tegra/android-tegra3-grouper-3.1-jb-mr1.1' into jb422