Collapse the "version control revision/tag" AST file record into the

metadata record, which already had other version information. Clean up
the block info block along the way.

llvm-svn: 166204