resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index e1a8c0b..797314a 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -110,4 +110,3 @@
 $(error Trying to build sdk_addon, but product '$(INTERNAL_PRODUCT)' does not define one)
 endif
 endif # addon_name
-