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

Change-Id: I877b59339d1cfc3a8953b298f975365db55d3a22