Merge "more O_CLOEXEC" am: 9f8ed6500a
am: 7c27266544

Change-Id: I1b2c3f06bf02e2170f3ffa70d10d37d45da1a0c4