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

Change-Id: Ib76f200c6cf3ab1b39d155c290772267a6a4c02a