Merge "Update for v4.15 kernel uapi headers."