Merge "Frameworks/base: Wall Werror in drm"