Battery drainers, some cleanups
Merge branch 'jellybean' of git://github.com/XYAOSP/vendor_aosp into jellybean
Merge branch 'jellybean' of github.com:NukeAOSP/vendor_aosp into jellybean

Conflicts:
	config/version.mk