am 9152d407: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."

* commit '9152d407e48643255f26c745db688702286f075e':
  Whitelist another exception during dex2oat resolving.