Tool Labs: Fix variable substitution.

Apparently, - is a valid part of a variable name.  How... quaint.

Change-Id: I21a7b66ce776f4f47169dafe8f2fd97519d2e986