Don't append -plugin to the zip

Change-Id: Id13e33dd571e42bd6e56f8ede65ab01310c8e780