Merge "Make vendor_init check SELinux before setting properties"
am: f09649c231

Change-Id: I352c9be985d9d87d861d7ef58230d845f06b23bf