Merge "Fix build failure when using javac toolchain"