am b96f1083: Merge "Move libhardware of <asm/page.h>."

* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
  Move libhardware of <asm/page.h>.