Merge changes I78041b1b,I5736187b

* changes:
  Remove some Tests that are passing from external_oj_libjdwp_art_failures.
  Rename libjdwp expectations files.