Merge "Fix building tests with partial arch codegen support"