Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"