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

Change-Id: I8ed462c9ea581361e449e3549f37667b61d579b2