Updated SDK to commit 6f0e9f3f155b2a40b59d18544136056552d87f8d
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/colors.xml