Merge pull request #16 from bob-wilson/missing-swift3-cherrypicks

Missing swift-3.0 cherry picks for swift-clang