[automerger skipped] Moving /odm/build.prop to /odm/etc/buid.prop am: 33ff6020 am: 63b4c9eb
am: cd5085c2 -s ours
am skip reason: change_id I6f88763db755c9ec6068bfdd9cee81c19d72e9d7 with SHA1 6c628840 is in history
Change-Id: I4bc6d71b9c92edcc500f776e94de0de67caa10a8