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

Change-Id: I2d7bc09846eff34923f3442c38ca94458634b007