Merge changes I805784bb,I85fe08d0,If0c30d6c

* changes:
  Add TEST_MAPPINGs for java.net code.
  Revert "Add an example of an annotation-based TEST_MAPPING."
  Revert "Add test with known failure on virtual devices to TEST_MAPPING."