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

Conflicts:
	res/values/colors.xml