Merge "Fix more unused parameter warnings in frameworks/av/drm." into nyc-dev