am 97742073: resolved conflicts for merge of 5554c0c0 to lmp-dev-plus-aosp

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