am 8376830b: Merge "Handle another untyped dex CONST issue"

* commit '8376830b762fbe974a9ddd2d43c640655883c7ab':
  Handle another untyped dex CONST issue