sanjoy accepted this revision. sanjoy added a comment. This revision is now accepted and ready to land. lgtm, but I don't think it is correct to state "No functionality changed." in the commit message. http://reviews.llvm.org/D21158