Merge "Test: Upgrade to Junit4 in Java instrumentation tests"