Switch from Tegra2 Bionics to Generic

Change-Id: I068a43563e87b5bdf2dc63db61b30a0a6bdea50b