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

Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca