Merge \"Fix art::ArchTest::FinalizeSetup not being called.\"
am: 6e5e3b2e91

Change-Id: I2791958a7a77d62390805037e789be48fa58e23f