am be5410ff: (-s ours) Gradle 2.2 DO NOT MERGE

* commit 'be5410ff0255fca0741bd79e9780af8c527bc7b8':
  Gradle 2.2 DO NOT MERGE