Merge changes I129fbc84,I9238ee0b

* changes:
  ART: Fix JDWP GetClassLoader command
  Revert "ART: Fix JDWP GetClassLoader command"