am 0da09a02: Merge "Only allow whitelisted exceptions during dex2oat resolving."

* commit '0da09a026fb6c612e659dc782312987b4515f472':
  Only allow whitelisted exceptions during dex2oat resolving.