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

Change-Id: Id15778c7e8747069c6e09e3dacf1f98fcc79ceeb