Merge "Remove ashmem from development repository"