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

Change-Id: I3e0e165d8bae1ec454bf6a7e6778083e1ce8f0a7