Merge "ART: Change behavior for rethrowing init failures (2)" am: ef7ef4ce04
am: a62884320b

* commit 'a62884320b76e1893fde2073c5fdb5fd008e394c':
  ART: Change behavior for rethrowing init failures (2)