Merge "Get DCHECK back to EncodedStaticFieldValueIterator" am: 37fcf39935
am: 1e3b6338fa

* commit '1e3b6338fa9aa10d74e08753ab523111105d5979':
  Get DCHECK back to EncodedStaticFieldValueIterator