Merge tag 'v3.4.95' into cm11.0

This is the 3.4.95 stable release

Conflicts:
	lib/lzo/lzo1x_decompress_safe.c
	lib/lzo/lzodefs.h
	sound/core/control.c

Change-Id: Id8e7ff698f119131b9593d487503983807a6d089