Fixup makefile for new upstream changes.
Backport missing methods for PhfOrderedMap.