Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Reverted:

 *[3/3] Settings: Built-in superuser
  PS2: Fixed formatting issues
  Change-Id: Ia38f5a7737b7aff1d4d8291285dd1a17a5e63c1e
  Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>

 *Settings: Fix aapt locale set caused by SuperUser

 *SuperSU: Cleanup change to superuser
  Remove SuperSU drawables
  Don't hide SuperSU app from app drawer
  Change-Id: Ieee16e3e106c1d4af3f1402618e5f4d4f304ebf9

Signed-off-by: houst0nn <houstonn@gmail.com>
Change-Id: Ic46dc293f000c5d50240c879429abdf70d75b2f0