Merge "Create selinux_policy phony target" am: 915c0070fa
am: 2f4df755ae

Change-Id: I4a273520e7a5a92f5739f413d8773ddb3c6a259a