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

Change-Id: Ibca5d90522ec47397f030501782c125002a27f3b