swift234

Convert code that was using ~0 as a failure value to use llvm::Optional instead.

Also remove some redundent includes.

Swift SVN r26746