Reformat the usage message

Change-Id: I453102e95799e16fd16c90755f69ea4f4ebaab9c
Refactor logic around selinux bug 1204824

Change-Id: If9db8359ad77a9a77ceefabac4d71fef3c162935
Merge "Reformat the usage message"
Merge "Refactor logic around selinux bug 1204824"