am c6ecccb2: Merge "Fix the build." into gingerbread

Merge commit 'c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp

* commit 'c6ecccb284401b6312108f927ffcfc303872f380':
  Fix the build.
diff --git a/api/current.xml b/api/current.xml
index 8551477..cf7e0d3 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -85364,36 +85364,6 @@
  visibility="public"
 >
 </field>
-<field name="mControlChangeStatusListener"
- type="android.media.AudioEffect.OnControlStatusChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mEnableStatusChangeListener"
- type="android.media.AudioEffect.OnEnableStatusChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mId"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="mListenerLock"
  type="java.lang.Object"
  transient="false"
@@ -85414,36 +85384,6 @@
  visibility="public"
 >
 </field>
-<field name="mParameterChangeListener"
- type="android.media.AudioEffect.OnParameterChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mState"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mStateLock"
- type="java.lang.Object"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="AudioEffect.Descriptor"
  extends="java.lang.Object"