DO NOT MERGE Remove RecyclerView tests form pathmap

Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae370be73fbc920177c87e739d7353059b)
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 446c82c..cbf392d 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -113,7 +113,6 @@
         v7/cardview \
         v7/mediarouter \
         v7/palette \
-        v7/recyclerview \
         v8/renderscript \
         v13 \
         v17/leanback \
@@ -132,13 +131,15 @@
 #
 FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
 	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
-	$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
+	$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
+	frameworks/support/v7/recyclerview/src
 
 #
 # A list of support library modules.
 #
 FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
     $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \
+    android-support-v7-recyclerview \
     android-support-multidex \
     android-support-multidex-instrumentation