Merge changes from topic 'art_javac'

* changes:
  test: Modify 536-checker-intrinsic-optimization for javac/dx
  test: Modify 593-checker-boolean-2-integral-conv for javac/dx