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

Change-Id: I029da89e05b6bc5eff525742241132ea77275616