Merge "Moving /odm/build.prop to /odm/etc/buid.prop"