Merge "ART: remove nested include in arch_test"