Silliness

Revert "Switched to my own android_hardware_samsung. Hah"
This reverts commit 2110e5d7184dec6a07948319a5aaac3b73d56930.

Revert "Re-enabled lots of stuff"
This reverts commit b3e5068277eb27718686e008a7dd4cc99877c721.

Revert "Use dastin's d710 repo"
This reverts commit 81d1c84c8fc976904b76298fe7bdb2e451d1ce55.
Removed an unneeded extra file

Change-Id: Id545f3674a9f1b5443ab2f10c8c074527c1ad5e9