am 925efa11: Merge "Remove include <linux/android_pmem.h>"

* commit '925efa11c8bc56f3d824666538fc69605b0aa7aa':
  Remove include <linux/android_pmem.h>