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

Change-Id: Iadb7c5025651e0dc94703f6842efc5907aa9013d