Small tweaks to remove admob/mmedia dependencies
Merge branch 'rl-lint' of github.com:appnexus/mobile-sdk-android into rl-lint

Conflicts:
	sdk/sdk.iml