Merge "libion: add 4.12+ kernel headers for forward compatibility" am: c849088284 am: af37a3e77a
am: f65c7e24c3

Change-Id: I618c09246a18f6e2feb1414ce3e76599b74cd276