Merge "Refactor sanitized library on-disk layout - Make." into oc-dev