Merge "Moving /odm/build.prop to /odm/etc/buid.prop"
am: 5436843246

Change-Id: If1ebe2dc9c22414b090275dcd7172ec4bae4ecb4