Merge "Fix DRM includes" into qt-r1-dev-plus-aosp
am: 3820d19650

Change-Id: I283af0d0144decb2ab7f478bd7722bbadde428ec