diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index 20a768ca..34681f98 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -48,24 +48,23 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
 
-# $(call local-intermediates-dir)/proto/$(LOCAL_PATH)/cdm/core/src is used
+generated_sources_dir := $(call local-generated-sources-dir)
+
+# $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src is used
 # to locate *.pb.h by cdm source
-# $(call local-intermediates-dir)/proto is used to locate *.pb.h included
+# $(generated_sources_dir)/proto is used to locate *.pb.h included
 # by *.pb.cc
-# The module that depends on this prebuilt will have LOCAL_C_INCLUDES prepended
+# The module that depends on this library will have LOCAL_C_INCLUDES prepended
 # with this path.
-# Use "=" instead of ":=", so $(intermediates) will be expanded to the
-# correct intermediates depending on it's for the 1st arch or 2nd arch.
-LOCAL_EXPORT_C_INCLUDE_DIRS = \
-    $(intermediates)/proto \
-    $(intermediates)/proto/$(LOCAL_PATH)/cdm/core/src
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(generated_sources_dir)/proto \
+    $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src
 
 include $(BUILD_STATIC_LIBRARY)
 
 # proto_generated_headers is a build system internal variable defined in
 # $(BUILD_STATIC_LIBRARY). We can use cdm_proto_gen_headers later to establish
 # the dependency.
-# TODO: fix cdm_proto_gen_headers for multilib build.
 cdm_proto_gen_headers := $(proto_generated_headers)
 
 # -----------------------------------------------------------------------------