am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

* commit '04cff70804810d27e1fcbef556ebfdc39278d746':
  ota_from_target_files: Add an option to not sign OTA packages