My previous reorganization of addressof broke -std=c++03. Thanks much to...

My previous reorganization of addressof broke -std=c++03.  Thanks much to Arnold Schwaighofer for catching this.  This patch also catches a few more missing addressof in <future>, thanks go to Zhihao Yuan for catching these.

llvm-svn: 187997