Fix .gwtar build process.

Change-Id: I72cecca7ad18ef3dc4a3e98bb76e7e622c5b44ab
(cherry picked from commit fbfde8584e389307fe753b33c21e8941f9517d5b)