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

* commit 'cf16ca1635df0d04668b09e47563b872f513c6fe':