Merge remote-tracking branch 'seandroid/seandroid-tegra3-grouper-3.1-jb-mr1.1' into sm-jb-mr1-wip