Don't export ARCH and SUBARCH, set them explicitly

Change-Id: I1f3637202e78ba1c9448769251e641ba0af17624
1 file changed