Internal cleanup

* Make more targeted dependencies where we can
* Remove build targets for folders that are no longer there

Change-Id: I3477e7d2b06e6095badfed18f4977d26757ba3ea
diff --git a/v7/palette/Android.mk b/v7/palette/Android.mk
index bf57ce3..4261099 100644
--- a/v7/palette/Android.mk
+++ b/v7/palette/Android.mk
@@ -19,7 +19,8 @@
 #
 #   LOCAL_STATIC_ANDROID_LIBRARIES := \
 #       android-support-v7-palette \
-#       android-support-v4
+#       android-support-compat \
+#       android-support-core-utils
 #
 # in their makefiles to include the resources and their dependencies in their package.
 include $(CLEAR_VARS)
@@ -29,7 +30,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
-LOCAL_SHARED_ANDROID_LIBRARIES += android-support-v4
+LOCAL_SHARED_ANDROID_LIBRARIES += android-support-compat android-support-core-utils
 LOCAL_JAR_EXCLUDE_FILES := none
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly