This reverts commit 2e8afd87. Reason for revert: SELinux Boot crash Bug: 75974893 Change-Id: I4751530a1b460842130a495efe688aaf19b92638