Merge "Better partitioning module/non-module libraries" into udc-dev