Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (47 commits)
  drm_hwcomposer: support virtual displays
  drm_hwcomposer: fill hwc_display_contents retireFenceFd
  drm_hwcomposer: Bump the acquire fence timeout to 83ms
  drm_hwcomposer: Process modesets via compositor
  drm_hwcomposer: fix crash in hwc_set()
  drm_hwcomposer: Set timeouts for fence waits
  drm_hwcomposer: use GL_TEXTURE_EXTERNAL_OES target for src textures
  drm_hwcomposer: implement the safe handling of layers
  drm_hwcomposer: Make gl worker log tag consistent with rest of hwc
  drm_hwcomposer: Plumb frame number through display composition
  drm_hwcomposer: correctly handle rotation + cropping
  drm_hwcomposer: use HWC_FRAMEBUFFER_TARGET if all HWC_OVERLAY layers are skipped
  drm_hwcomposer: Allow NULL crtcs in display composition
  drm_hwcomposer: Allow layer transforms
  drm_hwcomposer: cache the framebuffers given to the GLWorker
  drm_hwcomposer: add properties to disable overlays or to use HWC_FRAMEBUFFER
  drm_hwcomposer: enhance stability using various wrapper classes
  drm_hwcomposer: style fixes
  drm_hwcomposer: duplicate buffer_handles before hwc_set returns
  drm_hwcomposer: fix buffer leak when using the GL compositor inside DrmDisplayCompositor
  ...

Change-Id: I8f8131183c74df898812d2f3ae6c6a482d7d7f9e