Merge "Update for new kernel headers." am: 758e52551f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466035

Change-Id: I51d64f9a60faff2db9cb6813060703b19043ecda