Merge "test: More javac/dx fixes" am: 5ab5427dd5 am: 8adc6c59ba am: 0bb63f4ef6
am: aff83a8451

Change-Id: I6f9fd3ed89b402435a32cfecee106ac712777219