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

Change-Id: I761006c6460206dc31028cb7eef20b50a53be7ba