Merge "init: replace property_get with its android::base equivalent" am: 7bcce1e3c0 am: 6ee34f0286
am: b324ffeb79

Change-Id: I1b45aaa8e600d5d31873e73e04846a8cb24c5878