Unfork Optional.java.

Just package the class from the guava dependency instead. Note the
dependency-fu needed in core/pom.xml and assembly/pom.xml to not
expose the guava dependency in the user's compilation classpath.