Create tarfile correctly

Change-Id: I09e7d11fbdbcf585e50a5ce2cc9b176c246c1806