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

* commit '7c4a34642aecebb35845345cc86dfe63c86936f5':
  include oem.prop files in otatools_package