Merge "Export ion_4.12.h and ion_4.19.h" am: 524dc3f8ef
am: 9000ddccfc

Change-Id: Ieb7a3621e0703eabfb2fb7565c1ac4166473373b