am e5d75b22: Merge "Fix build for both old and uapi kernel headers."

* commit 'e5d75b22836482fd05bdf3ee5839cd666248f48c':
  Fix build for both old and uapi kernel headers.