am cf28b803: am ae4e1455: merge from open-source master
am 58248935: am cf28b803: am ae4e1455: merge from open-source master
Merge "Change buildspec to allow disabling SVG."
Moving junit out of core.jar and into core-junit.jar.

Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
Merge "Moving junit out of core.jar and into core-junit.jar."
Undo commit: Moving junit out of core.jar and into core-junit.jar

Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
Merge (-sours) commit '3600a1604a07db7edd1b753638827d68a640a185' into oxygen_4.3

* commit '3600a1604a07db7edd1b753638827d68a640a185':
  Undo commit: Moving junit out of core.jar and into core-junit.jar
  Moving junit out of core.jar and into core-junit.jar.