Updated SDK to commit 87612398d6b951f9e8296cb6500b0056a2338046
Updated docs
Updated SDK to commit a4986c52ecef1bca15907f22f2bd0b04c26c11e4
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/colors.xml