Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	adb/usb_vendors.c
	libusbhost/usbhost.c
	rootdir/Android.mk
	rootdir/init.rc
	toolbox/Android.mk
	toolbox/watchprops.c

Change-Id: I8686c4a78b85feafa25da9203d88f9a33b264796