Merge "Refactor sanitized library on-disk layout - Make." into oc-dev
am: 07029188f6

Change-Id: Ic852bca174aed7de3085a9048a1e0199acd93e4f