Fix Filter and Profile linkage&layout - YiYin
Merge remote-tracking branch 'origin/master'

Conflicts:
	ConnectMentor/facebook/build/intermediates/bundles/release/classes.jar
	ConnectMentor/facebook/build/outputs/aar/facebook.aar