Update modular development

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Fix derp
Merge branch 'kitkat-staging' of https://github.com/SaberDroid/build into kitkat-staging

Conflicts:
	core/binary.mk