Merge Google common post 3.0.18

commit '1f8c5cecfe44994cd617ba2803f41fb56d53e91c' into dhacker29

Conflicts:
	drivers/input/evdev.c