update
Merge remote-tracking branch 'teamwin/android-4.4' into android-4.4

Conflicts:
	BoardConfig.mk