Fix bug in using key/value substitution list for archives

Change-Id: I26b18099f4b09bf9161e17b0f0a59fc2ff0f886a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>