Merge "Update junit targets to support external/apache-harmony/jdwp"