Merge "Drop obsolete javac -extdirs commandline arg."
am: 5d691e597a

Change-Id: I1c5c3f4cbadfab41c03a6a1e0320d10b390b0446