Fix building on 4.4

Change-Id: I85030de3dea5f2d1a187cf2ced9517b3c820266a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	android/reboot.c
	include-full/autoconf.h
	include-full/usage_compressed.h
	include-minimal/autoconf.h
	include-minimal/usage_compressed.h

Change-Id: Id6c49c1b49def2a442c4370d4d4ecb02faf0e44a