am a2d22663: am ebb4d67d: Don\'t export ARCH and SUBARCH, set them explicitly

* commit 'a2d22663d69b33aa481f9ab09785737a8030c5f3':
  Don't export ARCH and SUBARCH, set them explicitly