Merge "Update to kernel headers v4.10."
am: 08b6334058

Change-Id: Id037c94aa8b27e2ae128c90d4811550d2166c70b