am e11eb154: Merge "Art: fix basic block optimization pass"

* commit 'e11eb154b52e2036d775c2df491a70bf7ef04de3':
  Art: fix basic block optimization pass