Merge "Bug 463010 - Change aggregator build to unpack200 with Java 8, instead of Java 6 "