[automerger skipped] Merge "Moving /odm/build.prop to /odm/etc/buid.prop" am: 5436843246
am: 913684f559 -s ours
am skip reason: change_id I0733c277baa67c549bb45599abb70aba13fbdbcf with SHA1 3182ea132e is in history

Change-Id: I95a74ca04616de11d1d0deee24e05306bb884ecf