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

* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
  Remove incompatible ashmem.h