c6ef183975
subprocess.check_call() returns a byte-string which needs to be turned into a unicode string for python3 compatability. Also some minor refactoring while we're here. Closes-Bug: 1536462 Change-Id: Icd957bc4d93ccad94b1246ad62e6e02ee14d9ca5