Merge "Fix DRM includes"
am: 46f3e8f929

Change-Id: I0d5344b312a3ebaa87688f8fb86ce28b00865c3c