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

Change-Id: If9cc2846d31c15b193f2367529d6bb80d100f059