Merge branch 'lollipop-x86' of http://git.android-x86.org/platform/hardware/drm_gralloc
Bug: 18959563