Update to latest things needed to build.
Merge remote-tracking branch 'upstream/gradle' into skinny

Conflicts:
	build.gradle
	espresso-runner-runtime/build.gradle
	espresso-runner/build.gradle
	espresso-sample/build.gradle
	espresso-support-v4-tester/build.gradle
	espresso-support-v4/build.gradle
	espresso-tester/build.gradle
	espresso/build.gradle
	gradle/wrapper/gradle-wrapper.properties