Merge "Fix multilib test data being installed twice to the same place"