Merge "test: More javac/dx fixes"