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

Change-Id: I2d72f81e784cfd64de925611357c4ea643ed6ac8