Merge "Refactor sanitized library on-disk layout - Make." am: 41b0d9e146
am: f8f29940dc

Change-Id: Ie2d1162df7c5f5cf88260a9663b174d7b04f3b05