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

Change-Id: Ica4813dcf76197b8866307c7c0ba5fc4a56fd6e3