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

Change-Id: I5f337b959fb2950545cc032811b3a727860378e8