Merge "Update to kernel headers v4.9.6." am: 251a92c93f am: b1082232a3 am: 89ca923dd5
am: 2eb752b5a2

Change-Id: Id4af6c8b33a4324a86380ea4fa5d6648a545c1d6