Merge "ART: Change behavior for rethrowing init failures" am: accc24985c
am: 6e1f6aab91

* commit '6e1f6aab91a49d7657b947ea21386637afb04867':
  ART: Change behavior for rethrowing init failures