Revert "Fix resource leaks in drm hal"

This caused b/38343526 which is a chase list issue, reverting for now.

This reverts commit 4e1fe736af1b88485bba762b11bc0c11a447819c.

Change-Id: Ib9ffcd11e575e3f05f54cbea17fda2f2eb3780b5
diff --git a/drm/1.0/default/DrmPlugin.h b/drm/1.0/default/DrmPlugin.h
index d951c92..dce6c0c 100644
--- a/drm/1.0/default/DrmPlugin.h
+++ b/drm/1.0/default/DrmPlugin.h
@@ -46,7 +46,7 @@
 struct DrmPlugin : public IDrmPlugin, android::DrmPluginListener {
 
     DrmPlugin(android::DrmPlugin *plugin) : mLegacyPlugin(plugin) {}
-    virtual ~DrmPlugin() {delete mLegacyPlugin;}
+    ~DrmPlugin() {delete mLegacyPlugin;}
 
     // Methods from ::android::hardware::drm::V1_0::IDrmPlugin follow.
 
@@ -153,7 +153,7 @@
 
 private:
     android::DrmPlugin *mLegacyPlugin;
-    wp<IDrmPluginListener> mListener;
+    sp<IDrmPluginListener> mListener;
 
     DrmPlugin() = delete;
     DrmPlugin(const DrmPlugin &) = delete;