diff --git a/build/Android.mk b/build/Android.mk
index ddaa33e..9672427 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -21,7 +21,7 @@
 	$(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
 		 -e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
 		 -e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
-		 $< > $@
+		 $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
 
 $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
 	@echo Generate $@
@@ -29,7 +29,7 @@
 	$(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
 		 -e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
 		 -e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
-		 $< > $@
+		 $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
 
 
 # ===== Android Support/Compatibility Library =====