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

Change-Id: Id3c5d84e61db4db3c70dff4822b5cc4805ddaad3