Merge "Revert "create_test_jar.sh, loading-test{,2}-jar.sh: Migrate dx -> d8"" am: 5b85df7aea
am: 956e2adb66

Change-Id: I43103b27f40bac9819b52ff73b1f0e799c799528