Merge "releasetools: Refactor ota_from_target_files.py." am: c1c01c6504
am: a95168b221

* commit 'a95168b221ac1f58d05dd2997c5d39e9d064ceb5':
  releasetools: Refactor ota_from_target_files.py.