Merge "Hopefully fix funky SELinux labels." into oc-dev
am: a4a729ebd0

Change-Id: I9d4f644acb310bcd45c0959e154799f474c1cb28