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

* commit '7fbaa22e10979cf17b8c1c0c96bef4919e9d4163':
  ART: Fix the simplifier for add/sub