Merge "Support additional dynamically linked library in plugins" into udc-dev