am b1a1f9a1: am e33d0cb5: Merge "ART: Don\'t fail on unsupported conditions in boolean simplifier"

* commit 'b1a1f9a192b0391ddfad80d2375adef8013c828d':
  ART: Don't fail on unsupported conditions in boolean simplifier