Merge "Revert "Fix gtests after loop inlining support.""
am: 6c2574c887

* commit '6c2574c8879fff57ffc611ab7214daa97cf6f51d':
  Revert "Fix gtests after loop inlining support."