Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev

media/java/android/media/Ringtone.java

@@ -469,6 +469,7 @@ public class Ringtone {
             synchronized (sActiveRingtones) {
                 sActiveRingtones.remove(Ringtone.this);
             }
+            mp.setOnCompletionListener(null); // Help the Java GC: break the refcount cycle.
         }
     }
 }