Merge "bionic and init don't need to share knowledge of property file locations."
am: 9cd890e9b7

Change-Id: I5dea4b63c71322d1e5502c3f1a4f449a91b15b71