Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09
am: 84ccb2dbe0

Change-Id: I87dea345156be3f0745e4df513b725fa451823b3