Revert "Try using clang 3.5 again."

This reverts commit 2b910cd0d16f29010a7601f38cf1223a2b2fb248.
Revert "Use clang 3.5."

This reverts commit 2579833a37c175e7067f40ed3b4e7c590c017144.
Update optional.