CBLT-82:  fix up ARCH parameters

Change-Id: I7d974f44bf6c2bd5fa7a5e5a3968def6c72367fb
CBLT-82:  fix up ubuntu ARCH parameter

Change-Id: I4fae11eb7e46616ee88a768a1374b7d0cbd96f2a