Merge "Switch vogar from toolchain=jdk to toolchain=dx"