Merge "libion: Adapt to new ION interface" am: c7750dce6b
am: b8fc78c7d4

Change-Id: Ice84ec1fb741f345f2459670f773d06c97992e55