Merge changes from topic 'build-vts-zip'

am: d0c693ff64

Change-Id: Ic2b1d3165c4da7d89080f3016286a4a7ed815b2b
This commit is contained in:
Dan Willemsen 2017-01-04 23:05:35 +00:00 committed by android-build-merger
commit a50ead8336

Diff Content Not Available