Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae
am: 7e772f8194

Change-Id: I6f96618cb56344a294d06be9f48c1586be3a1bbf