Merge "add drm/ directory to include it as part of frameworks"