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

Change-Id: Ic3661de374d9bd375f544a35212ab685196ac7ed