Merge "Load {default,build}.prop from /{system,vendor,odm}/etc/" am: a9aa77d259
am: 26c4bcfadd

Change-Id: I4dd7c0b729026390e58902a3f6c8d27d483a46ba