Merge "Remove the hack for including libpagemap's headers."