Revert "Settings: Add bridge to PerformanceControl (Test) Conflicts: 	Android.mk"

This reverts commit 4c9024824382b7c164c2daa234892add41e586fc.

Change-Id: I7c3d031d49d5c1208155f004587a2bafa6ad8727
Merge "Revert "Settings: Add bridge to PerformanceControl (Test) Conflicts: 	Android.mk"" into 4.4