am f647a3c8: am 3cd5b66b: libcutils: Dont include kernel header + add defines

Merge commit 'f647a3c8aa99073c1da882b22c08b7b2a17c318b'

* commit 'f647a3c8aa99073c1da882b22c08b7b2a17c318b':
  libcutils: Dont include kernel header + add defines