Port Back Performance Control from JB

Change-Id: I4da1551f7e52617778195758f4cca492fe6433e9

Conflicts:
	AndroidManifest.xml