am f4325cee: am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit 'f4325ceea48103490aacbf335280e94ea24cdd8f':
  Remove incompatible ashmem.h