fix merge

rm now-unneeded workaround
https://github.com/mopub/mopub-android-sdk/pull/97
apparently was fixed in 2.3