Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd
am: 3a88054509

Change-Id: Ie0d592b4d97f46e8d369c63c9a9e82bfeacb419d