Snap for 8512216 from f3b93a52850c6efe3acbba8e704cacfcfb5ff78b to tm-frc-os-statsd-release

Change-Id: I74f0580e64e5dfa72cb8c3749cb34bd1dd3226de
diff --git a/Android.mk b/Android.mk
index fe228dd..9535e04 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,9 +88,9 @@
 $(eval include $(CLEAR_VARS))\
 $(eval LOCAL_MODULE := $(addprefix hyph-, $(2)))\
 $(eval LOCAL_SRC_FILES := $(addprefix $(1)/hyph-, $(addprefix $(2), .pat.txt .chr.txt .hyp.txt)))\
-$(eval LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MPL)\
-$(eval LOCAL_LICENSE_CONDITIONS := notice)\
-$(eval LOCAL_NOTICE_FILE := $(wildcard $(addprefix $(LOCAL_PATH)/$(1), /NOTICE)))\
+$(eval LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-FSFAP SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-MPL)\
+$(eval LOCAL_LICENSE_CONDITIONS := notice reciprocal restricted)\
+$(eval LOCAL_NOTICE_FILE := $(wildcard $(addprefix $(LOCAL_PATH)/$(1), /NOTICE /LICENSE)))\
 $(eval include $(BUILD_HYB))\
 $(eval include $(CLEAR_VARS))\
 $(eval LOCAL_MODULE := $(addprefix $(addprefix hyph-, $(2)), .lic.txt))\
@@ -101,7 +101,7 @@
 $(eval include $(BUILD_PREBUILT))
 endef
 
-$(foreach l, $(pattern_locales), $(call build-one-pattern-module, $(dir $(l)), $(notdir $l)))
+$(foreach l, $(pattern_locales), $(call build-one-pattern-module,$(dir $(l)),$(notdir $l)))
 build-one-pattern-module :=
 pattern_locales :=