Merge "Add O_CLOEXEC" am: 62833808b0 am: fdbcccb9ee
am: 923c3251eb

Change-Id: Ib686fa0bed8dcb1e8e4f78cce9423f478ef36063