Merge "Add a test multiarch app."