Merge "ART: Clean up strings fixup for app images."
am: 1ef02af31d

* commit '1ef02af31d5936a59ddeb762cb3cf767b599787a':
  ART: Clean up strings fixup for app images.