Merge "Allow drm plugin to be released when binder dies" into oc-dev