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

Change-Id: I0f27f6bf444929f856f6ae0bec0cfc4078bf09d9