Derp
Update to tegra2 and add back arch_variant_cpu