Changing the router scan flag to a more conservative one
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

# By Ali Naddaf
# Via Ali Naddaf
* 'master' of https://github.com/googlecast/CastCompanionLibrary-android:
  Changing the router scan flag to a more conservative one

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/BaseCastManager.java