Merge remote-tracking branch 'origin/swift-3.0-branch' into stable

* origin/swift-3.0-branch:
  Clean up some whitespace and comments for the new logging builtins patch.
  Add support for __builtin_os_log_format[_buffer_size]