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

Change-Id: I9d83e507ab8e21df6db2c6e7626734d75aac7e50