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

Change-Id: I896e8ceebf64253978f671e545adf8a41ae8b191