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