am fc3c8256: am 7d4c9612: Merge changes I0666e671,I90a1aed6

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