Merge "Add all shared info libraries in first pass" into udc-dev