Merge "Add new header to support 32 bit/64 bit dumps."