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

Change-Id: I628260ec6f2f0c7d7bdb9c44e241958e3f9d4889