am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip."

* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.