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

Change-Id: If58aa5312ef778b960c979a94b1bf4132753dfa8