am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit '66ad04bc039c73763c55c8d3aad282378e05d257':
  Remove incompatible ashmem.h