Merge "Fix 2ND arch gtest testing."