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

Change-Id: Ibc5af95683c83d81fd970725a453990a9678b374