Revert577

Revert WiDi 2 patches since it can't work on Android 4.0 or 4.1