Collapse res-aosp and res-icons into res folder for AOSP Contacts (1/2)

bug:31022536
Change-Id: I0434710d92027e59ccd97e27ebd09f1668346684
diff --git a/Android.mk b/Android.mk
index a03d671..47653cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
 endif
 
 src_dirs := src src-bind $(phone_common_dir)/src
-res_dirs := res res-aosp res-icons $(phone_common_dir)/res
+res_dirs := res $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))