Merge remote-tracking branch 'omni/android-4.4' into android-4.4

Conflicts:
	init/init.c
	init/init.h