fix number picker blue line and highlight

Change-Id: I473c855a0e2cd068e62cd2ec4b807c04215b1c81

Conflicts:

	core/res/res/values/colors.xml
Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy