Merge remote-tracking branch 'imgsystems/4.1-imgsystems' into aosp/master

Conflicts:
	arch/mips/boot/dts/pistachio/Makefile
	arch/mips/boot/dts/pistachio/pistachio_marduk.dts
	drivers/usb/gadget/function/f_rndis.c
	drivers/usb/gadget/function/rndis.c
	drivers/usb/gadget/function/rndis.h

Change-Id: Ibddb2db255830eb640d1df21b282b6a51369ea7c