Merge "Use system modules generated by soong when using javac -target 1.9"