Merge "Revert "Fix gtests after loop inlining support.""