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

Change-Id: I33cdd20d9fbfe09b928d280ece0c3e57a0c5c49f