Updated SDK to commit 9684ed6f2589bfd6f909861682e70b64ec8c5008
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/strings.xml