Updated simplified Chinese translations.

Change-Id: I8b6fdd0750ec0924dfdc7832675d2cf67dd83d84
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2

Conflicts:
	res/values-zh-rCN/strings.xml