Snap for 5220519 from 771c0d6731b81f317623bd2c88c40835d305249a to qt-release

Change-Id: Ib56e578a9c6fa57bfaf281eb6f894243d8817569
diff --git a/src/util/Android.mk b/src/util/Android.mk
index 4cd8491..b2efde7 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -63,14 +63,14 @@
 	@cp -f $< $@
 
 MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
-LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
+LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H)
 
 $(intermediates)/format_srgb.c: $(prebuilt_intermediates)/util/format_srgb.c
 	@mkdir -p $(dir $@)
 	@cp -f $< $@
 
 MESA_FORMAT_SRGB_C := $(intermediates)/format_srgb.c
-LOCAL_GENERATED_SOURCES := $(MESA_FORMAT_SRGB_C)
+LOCAL_GENERATED_SOURCES += $(MESA_FORMAT_SRGB_C)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)