Merge "Change atomics in ashmem from uint64_t to uint32_t"