Merge "Update for kernel headers v4.8.14." am: 0c0f042736
am: 39ce1328d3

Change-Id: I3be03d73b5469ff19436e4c68e20fb0b5bc4ab1f