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

Change-Id: Id12e81a8ffee4e25d8aec93471da3ad90da7aeba