Updated SDK to commit 123badd7f3ccb43741d667343af8b45bb23a555e
Updated SDK to commit f013730c333dc32e4ce9572025504179c378c405
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/colors.xml