Merge "Use system modules generated by soong when using javac -target 1.9" am: 58cd98dc47
am: 7c381d8015

Change-Id: Id2bef3fcd07b5386394072925ea5c24008cb678d