Move ion allocations to use the same client.
am: 8f7984018b

Change-Id: Ia082b4c379e38d994a16069878731bc46ae312f0