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

Change-Id: I901ea405edd09385491b5e28b4b6e06f68f83f28