am fcd0d98b: Merge "include oem.prop files in otatools_package"

* commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc':
  include oem.prop files in otatools_package