Settings consolidation

ps2: Java half of WIP
ps3: fix 2 NPEs
ps6: Move adb icon, hostname, and bugreport BACK to development options.
     Move notification conversion back to sound settings
     Squish a bunch of stuff into VanirSettings
ps7: Add in Knokfirst's About Vanir Icons

Change-Id: I0b7ec5af9b5eedad6f33cd8b14f16717005ca916
Merge "Settings consolidation" into jb42