Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86

Conflicts:
	src/egl/drivers/dri2/platform_android.c
	src/mesa/drivers/dri/i965/intel_syncobj.c