Merge "Make CHECK(x) work with static analyzer." am: d02e6887ca
am: d0b09603dd

* commit 'd0b09603dd720ce9b93e33c073cae6fbf970d7ee':
  Make CHECK(x) work with static analyzer.