Merge "init: Replace property_set() with android::base::SetProperty()" am: 759240289b
am: 77fb48d990

Change-Id: I8c278f20554202d721b2bc62ef9cc675c365929c