diff --git a/Android.mk b/Android.mk
index cc9a53549..df048e563 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@ chips_dir := ../../../frameworks/ex/chips/res
 unified_email_dir := ../UnifiedEmail
 photo_dir := ../../../frameworks/opt/photoviewer/res
 emailcommon_dir := emailcommon
-res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res build/res
+res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6e8bff0f9..fdb25a98f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -53,4 +53,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.an
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
\ No newline at end of file
diff --git a/build/res/values/strings.xml b/build/res/values/strings.xml
deleted file mode 100644
index 591a41879..000000000
--- a/build/res/values/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- DO NOT TRANSLATE THESE STRINGS -->
-    <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
-    <string name="account_manager_type_pop3" translatable="false">com.android.email</string>
-    <string name="account_manager_type_imap" translatable="false">com.android.email</string>
-    <string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string>
-    <string name="intent_exchange" translatable="false">com.android.email.EXCHANGE_INTENT</string>
-    <string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
-    <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
-    <string name="protocol_legacy_imap" translatable="false">imap</string>
-    <string name="protocol_imap" translatable="false">imap</string>
-    <string name="protocol_pop3" translatable="false">pop3</string>
-    <string name="protocol_eas" translatable="false">eas</string>
-    <string name="application_mime_type" translatable="false">application/email-ls</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dae1025ed..04160e494 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1283,4 +1283,17 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
 
     <!-- Feedback uri to be used when feedback is enabled -->
     <string name="email_feedback_uri" translatable="false"></string>
+
+    <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
+    <string name="account_manager_type_pop3" translatable="false">com.android.email</string>
+    <string name="account_manager_type_imap" translatable="false">com.android.email</string>
+    <string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string>
+    <string name="intent_exchange" translatable="false">com.android.email.EXCHANGE_INTENT</string>
+    <string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
+    <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
+    <string name="protocol_legacy_imap" translatable="false">imap</string>
+    <string name="protocol_imap" translatable="false">imap</string>
+    <string name="protocol_pop3" translatable="false">pop3</string>
+    <string name="protocol_eas" translatable="false">eas</string>
+    <string name="application_mime_type" translatable="false">application/email-ls</string>
 </resources>
diff --git a/build/res/xml/providers.xml b/res/xml/providers.xml
similarity index 100%
rename from build/res/xml/providers.xml
rename to res/xml/providers.xml
diff --git a/build/res/xml/services.xml b/res/xml/services.xml
similarity index 100%
rename from build/res/xml/services.xml
rename to res/xml/services.xml