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

Change-Id: I5f91796eb17ec3dda29c4710e60cb7da13ad4dde