CBLT-82:  if ARCH is i686, change to i386

Change-Id: I1ba85a471acc4ad137482517b9198a5c846f5b50