Merge "Revert "Include vendor partitions in target zip generation""
am: 7ff7c2d870

* commit '7ff7c2d8709bf1f8fa6e6d8350dcea63f1a9b3e8':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I76559ad1211a38eecd7b15ec1a4b5ca5bd3f6914