Merge otc-private/master into freedesktop/master

Merge otc-private/master into freedesktop/master

* otc-private/master
  i965: Fix Linux build
  intel: Fall back to X-tiling when larger than estimated aperture size.
  intel: Refactor code in intel_miptree_choose_tiling().
  intel: Move the max_gtt_map_object_size estimation to intel_context.
  mesa: Insert custom text into version string at buildtime
  android: NV12 support in buffer creation
  YV12 support for Android
  i965: enable image external textures
  i965: support for YUV formatted external textures
  gbm: dri: support for creating YUV formatted buffers
  dri: introduce YVU420 (YV12)
  intel: refactor planar format lookup
  i965: support for setting surfaces for planar external
  i965: refactor sampling engine surface state setup
  intel: treat mip-tree as constant when resolving offsets
  i965: re-compile shader if external texture unit changes
  i965: support for reserving surfaces for planar textures
  intel: support for creating planar external image textures
  i965: extend VS sampler to surface relation to 1:N
  i965: extend FS sampler to surface relation to 1:N
  dri2: x11: remove compiler warnings when converting native/opaque
  enable S3TC always
  i965: fast clear depth only if depth equals to color buffer depth
  Only build when BOARD_USE_MESA is true
  i915: Create mock implementation of GL_OES_image_external

Conflicts:
	src/mesa/drivers/dri/i965/brw_context.h
	src/mesa/drivers/dri/i965/brw_vs.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_screen.c