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

Change-Id: Ief9b40c0c6822933ed9fc0503dab73d0f3e74741