Clean up test.
Merge topic 'cross-compiling-toolchain-variables' into next

6b7e19e Clean up test.