Changing the router scan flag to a more conservative one
Merge remote-tracking branch 'upstream/master'

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