Merge "test: More javac/dx fixes"
am: 5ab5427dd5

Change-Id: I799f9dedbb8152ea8a22a683053e0ebb2506426c