Merge "Remove libpagemap include hack."