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

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