Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev

Author: marcone

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java

@@ -98,7 +98,9 @@ public void onCreate(Bundle icicle) {
         mWakeLock.acquire();
     }
 
-    public void onStop(Bundle icicle) {
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
         mWakeLock.release();
     }