Revert "Update strings.xml"

This reverts commit ff05b0a9dccc389b8cdd6f8244989f5907b17393.

Conflicts:
	res/values/strings.xml
Revert "remove adam aosp"

This reverts commit 41674d1abb5476ab51a76f490477135a6e6b736c.
Revert "update to 4.3.1"

This reverts commit 92b9d44df8a50f05b4e14a13fc5ce7dbed71f4e4.

Conflicts:
	res/values/strings.xml
Revert "update device settings part 2"

This reverts commit c67176715e7e005696bba79903edb0477c9ea3c9.

Conflicts:
	res/xml/device_info_settings.xml