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

Change-Id: I05892096e2f542bc5d3d79e6950a5da8cb89ecef