am 686af0b3: resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

Merge commit '686af0b3a5978356be3b1a97187c765d63f11623'

* commit '686af0b3a5978356be3b1a97187c765d63f11623':
  libc: add <sys/eventfd.h> and corresponding implementations.