Merge "Fix the last warnings in frameworks/av/ drm code." into nyc-dev