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

* commit '91b9be73b5e39e07bedbdeddfb75a5fca2ec441c':
  Only allow whitelisted exceptions during dex2oat resolving.