Merge "Switch vogar from toolchain=jdk to toolchain=dx"
am: 333b85f22b

Change-Id: I4f9f90ff5dc06c8276ac7d77de17c3bd08d458ec