Integrate Koush SU into Settings

Patchset 2: fixed some things

Change-Id: I81f5eccd7e1f5042e6999db86717534f0da2f4a3
Merge "Integrate Koush SU into Settings" into jb42