Merge branch 'omni/android-4.4'

Conflicts:
	BoardConfig.mk