Pack file_contexts into target_files zip. am: a6a3aa9398  -s ours
am: e4d716e38d

* commit 'e4d716e38d19ad5e0dd139ddcbc2a94719e2e33f':
  Pack file_contexts into target_files zip.