Merge "hikey: Use filegroup for drm_hwcomposer common files"