SysUI - Return Search as NavBar option [2/2]

See RC commit.  Bringing back search as a 'KeyCode' for
the NavBar as opposed to forcing it as a Shortcut to Google/Search.

Change-Id: Ia043ebb284e6b0ee64328d2331aff52510fd8c94
Signed-off-by: Zaphod <mwilson@acesappraisal.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/aokp/AokpTarget.java