Merge "Bug 3381298 Remove old /data/drm/plugins/native"