Settings: Update Legacy Options' Position

PS6:
- Fix imports

PS7:
- Fix layout resources

PS10:
- Test onPrepareOptionsMenu changes

PS13-14:
- Rebase

PS17-18:
- Redo

PS19-20
- Remove CM's Performance Settings, whitespace fix

PS21
- Fix a build error

Signed-off-by: Andre Saddler <ayysir@aospal.com>
Change-Id: Ife7b152a832ebdd9b5eb066158e0d71fc834dc73
Merge remote-tracking branch 'aospa-legacy/kitkat' into kitkat

Conflicts:
	AndroidManifest.xml
	res/xml/display_settings.xml

Change-Id: I06fde7f1b4fbe110802232e5cc671084f391de57