Squash 4.3 changes.

PS2
  Readd fix

Conflicts:
	src/com/android/musicfx/ControlPanelPicker.java

Change-Id: Ifd7e0788daa5d770795cb2e679c21fe1acb68e82