Switch ion & AndroidAsync to cm-11.0

Change-Id: I52d95ec86524d72491ba2578846c90b6005ee124
Merge remote-tracking branch 'upstream/kk' into kk