Merge changes I0666e671,I90a1aed6

* changes:
  Do not call art-on macro by default.
  Add support for debugging ART to the dalvik.gdb script.