Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd am: 3a88054509 am: 84910a47c8 am: 2b4f281142
am: c2e69092c0

Change-Id: I0428b44ccae05734b4bb018b85f065e256949f2a