am f156b901: am fa75fce5: Merge "update xattr.h"

# Via Android Git Automerger (1) and others
* commit 'f156b901b1e51971192c573444b5b7f63e6bc22a':
  update xattr.h