diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index 54a9352e..13ede4d8 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -149,7 +149,6 @@ LOCAL_SHARED_LIBRARIES := \
   libcutils \
   libdl \
   liblog \
-  libmedia \
   libprotobuf-cpp-lite \
   libstagefright_foundation \
   libutils \
@@ -217,7 +216,6 @@ LOCAL_SHARED_LIBRARIES := \
   libhidlmemory \
   libhwbinder \
   liblog \
-  libmedia \
   libprotobuf-cpp-lite \
   libstagefright_foundation \
   libutils \
diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk
index 67ad53bf..bf02ae64 100644
--- a/libwvdrmengine/cdm/Android.mk
+++ b/libwvdrmengine/cdm/Android.mk
@@ -36,7 +36,6 @@ LOCAL_SRC_FILES := \
     $(CORE_SRC_DIR)/privacy_crypto_openssl.cpp \
     $(CORE_SRC_DIR)/service_certificate.cpp \
     $(CORE_SRC_DIR)/usage_table_header.cpp \
-    $(SRC_DIR)/ami_adapter.cpp \
     $(SRC_DIR)/wv_content_decryption_module.cpp \
     $(METRICS_SRC_DIR)/distribution.cpp \
     $(METRICS_SRC_DIR)/event_metric.cpp \
diff --git a/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp b/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
index d33306da..29a256cd 100644
--- a/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
+++ b/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
@@ -2,7 +2,6 @@
 
 #include "wv_content_decryption_module.h"
 
-#include "ami_adapter.h"
 #include "cdm_client_property_set.h"
 #include "cdm_engine.h"
 #include "initialization_data.h"
@@ -23,7 +22,9 @@ namespace wvcdm {
 Lock WvContentDecryptionModule::session_sharing_id_generation_lock_;
 
 WvContentDecryptionModule::WvContentDecryptionModule() {
-  report_root_ = new AmiAdapter();
+  // TODO (b/36497276)
+  // replace call to new AmiAdapter() and remove ami_apdater.*
+  report_root_ = NULL; // new AmiAdapter();
   front_end_ = new metrics::MetricsFrontEnd(report_root_);
   metrics::MetricsFrontEnd::OverrideInstance(front_end_);
 }