Merge "libbase: add O_CLOEXEC to <android-base/file.h>." am: 2a8460721c
am: b066d98187

Change-Id: I905f8c5572e4de791d818c5c5ae445418fc70d3b