Navigation button color option

Change-Id: I13c547f9d0c953abedf1600c9bf34dbf169e600b

Conflicts:

	core/java/android/provider/Settings.java