Merge "libtimeinstate: move map format info into shared header"