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

Change-Id: If59986dd60ca90836adecdf0cb52f3570bf81f9d