more cricket fixes, etc...

Change-Id: Ie57597400570c1917a5fc489a5b9e8debc5858a8
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_vendor_cm into cm-10.1

Conflicts:
	config/common.mk

Change-Id: I8dfe68f42a82d1750d02d1171d96ae53d6ce6aa2