Make argvu py3 compatible

Change-Id: Iff213b92ba7978da4d68daf42bf56d87023e771b
Merge "Make argvu py3 compatible"