Merge "Fix DRM includes" into qt-r1-dev-plus-aosp