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

Change-Id: Ida5d5ee258dc7bd5e74213c68a3263afda6591b7