Small cleanup to prepare for modular development

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Merge remote-tracking branch 'sd/kitkat-staging' into kitkat-staging

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>

Conflicts:
	default.xml