Merge "create_test_jar.sh, loading-test{,2}-jar.sh: Migrate dx -> d8" am: 6b82813ffa
am: 6b7505561b

Change-Id: I279f73f24f4ef0299d7d1c0b78153ef8fed58dee