s4-common: use new ION API

Change-Id: I3e00190e8effa12c9e6dc6177faa6baaa1406bac