Revert "Telephony: Add ME Depersonalization support."

This will need to be implemented in the RIL so it will not break building.
This reverts commit 5a793135c1582fb993751bdda24ebc0d6cd26771.
Revert "Telephony(MSIM): MultiSim support for PIN/PUK & Operator Name."

This will need to be implemented in the RIL as well so that it doesn't break building.

This reverts commit e4d85ddca90458f9e34d488a82a5da2d43a705a8.
audio: Add support for additional encodings and remove duplicates

Conflicts:
	media/java/android/media/AudioFormat.java

Change-Id: Ia13bcf951c758c86474153f48708e282407aed3d