kbarton commandeered this revision. kbarton edited reviewers, added: cycheng; removed: kbarton. kbarton added a comment. I'm closing this because based on the comments, this has been merged into http://reviews.llvm.org/D15916. If that is incorrect, please reopen. http://reviews.llvm.org/D15917