minor changes and clean-up
Merge remote-tracking branch 'upstream/cm10.1' into cm10.1

Conflicts:
	BoardConfig.mk