Merge "Fix build failure when using javac toolchain"
am: c098bea921

Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10