Merge Google common post 3.0.17

commit '09701e3edf03f92f4215aad83b32cd8cec7fb689' into dhacker29

Conflicts:
	drivers/usb/gadget/android.c
	fs/proc/base.c