am bd15ac07: am a4fe789a: Merge "Make ART fail gracefully when it can\'t update the desired code."

* commit 'bd15ac0780f3342cfe4ef93d205038caf91ed99b':
  Make ART fail gracefully when it can't update the desired code.