Rollback ion and rpmsg to state in cm-10.2

Change-Id: Idec739db4e6dd99abf284350fd9811ca8a875a76