Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev
am: b36b54cf79

Change-Id: I2b24f88411f9ebd20216371280b2f97fb150e640