Merge "Refactor sanitized library on-disk layout - SELinux." am: a2e9664c am: ebe26cbb am: ba0c430b am: 91b0903c Change-Id: I3315811aa97328a00ae123ac7ea9b454ebaa8ba6