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

Change-Id: I94067e2846c7ebcd422d8200164f8bea81748eb7