Merge "pagemap: admit to the test's requirement for libpagemap."