am 7d4c9612: Merge changes I0666e671,I90a1aed6

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