Merge remote-tracking branch 'facebook/master' into gradle

Conflicts:
	facebook/src/com/facebook/widget/WebDialog.java