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

Change-Id: I18ffd6f2f2843afa6534ba82caaf21e70f80e61e