[automerger skipped] Moving /odm/build.prop to /odm/etc/buid.prop am: 33ff6020
am: d12f6f20 -s ours
am skip reason: change_id I6f88763db755c9ec6068bfdd9cee81c19d72e9d7 with SHA1 33ff6020 is in history
Change-Id: Iac5767340138849ca3a2d3923a1911b9283fa2c6