Fix build for gcc 4.8.x

Conflicts:
	drivers/gpu/msm/Makefile
	drivers/video/msm/Makefile