Revert "Adding DeviceSettings properly"

This reverts commit 3e9426f400579813b3a490feb6d921f94f153349.
Settings: add Advanced menu for device-specific settings app

Change-Id: Ib022a224fe71522eb2432a112d2bdf64bc08c926

Conflicts:
	res/drawable-hdpi/ic_settings_advanced.png
	res/drawable-mdpi/ic_settings_advanced.png
	res/drawable-xhdpi/ic_settings_advanced.png
	res/values/strings.xml
	res/xml/settings_headers.xml