am 0c3ddba0: am 7fbaa22e: Merge "ART: Fix the simplifier for add/sub"

* commit '0c3ddba0f3859bd518e07d90ce8936a0b225b228':
  ART: Fix the simplifier for add/sub