Revert "Merge commit 'android-4.2.2_r1' into Upgrade_branch"

This reverts commit 2425cf376fb8f72e5aaea4f3cb3be3da91779f91.

Conflicts:

	res/values-pt/strings.xml

Change-Id: I8e11d197870e132cbb93a2c525f8cc032740d66f
Revert "This is a combination of 4 commits."

This reverts commit cb92e1c45b9a1d94b11dec9249a92c5f4d9542a8.

Conflicts:

	res/values/strings.xml

Change-Id: I26791eb8cb070aa40a7efaec76c07b97842a26c5