Improve archives syntax creation.

Change-Id: I8309731294c245202ca207204cf83fcce0721837
Merge "Improve archives syntax creation."