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

Change-Id: Ia7ea9b864c978332676110fec7d7d4c3a7b4f88f