Clean up formatting, rework run wrapper script to not use globals. (No functional changes expected). [email protected] BUG= patch from issue 2322963004 at patchset 40001 (http://crrev.com/2322963004#ps40001)
