Merge branch 'stable-2.9'

* stable-2.9:
  Upgrade gwtorm to 1.11

Conflicts:
	lib/BUCK

Change-Id: I29b5758c83c820749f54c1dcd072f562b0260209