Merge "Fix art::ArchTest::FinalizeSetup not being called."