Revert "XDivert changes for MSIM"

This reverts commit fa66d7833488cff0c0c6a69c92e87e2fc78af894.

XDivert links to some package we don't have, leading to a crash.

Change-Id: I740594dfbb1700fa45bf92dcdad4d23a03229b72
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0