Merge "Clean up NullCheck generation and record stats about it." am: 914d71e
am: 7cee2fe

* commit '7cee2fe1c39534d2dda4b80efcd7e7f098bc9b32':
  Clean up NullCheck generation and record stats about it.