am 4918e1ca: Merge "Fix a DCHECK failure IsResolved() || IsErroneous()."

* commit '4918e1ca05d0ec1510c7e997c5ae94cf6ce52045':
  Fix a DCHECK failure IsResolved() || IsErroneous().
  Avoid strict-aliasing problems with Handles.