Merge "Update to kernel headers v4.9.6."
am: 251a92c93f

Change-Id: I12a6072fff9193e95bbd80dfa81edde372f12e52