Merge "libion: Adapt to new ION interface" am: c7750dce6b am: b8fc78c7d4 am: 4c0339e154
am: 33b23ae8b2

Change-Id: Ie51c4762be462ba635cf0553865a1cafd53b084d