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

Change-Id: If5a42707641f1a5c11f15fe206766ed9fe646396