Merge "Refactor sanitized library on-disk layout - SELinux."
am: a2e9664cef

Change-Id: I184d353b6ca0c8e5b712da11b4de777e04a5b79f