Merge "Don't invent our own pagemap constants." am: 5079d0aabc
am: cb060d9bfb

Change-Id: I60b1aa9a76eb08eaeb9c546c8b2fec93bbaa5840