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

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