Merge "Fix building tests with partial arch codegen support"
am: 7521483357

Change-Id: Ifff7cd9a7fb13411423eba703b45361890158be0