Merge "Remove <utils/ashmem.h>." am: f9f76146a1 am: ee3202563b
am: 46ae7d36a4

* commit '46ae7d36a444cb9e3e4ab62e5d8c25aaf64938fa':
  Remove <utils/ashmem.h>.

Change-Id: I7c6aa71c371d5bf8078853868cd212414e61b1f1