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

Change-Id: If2a60781819c423f0e0cb13bf365d46762aa263b