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