Merge in upstream changes

From :https://github.com/phhusson/treble_patches

Change-Id: I785ed4d854f28f661b1b48530dc10a5adf076e74
diff --git a/patches/platform_build/0002-Set-ro.build.fingerprint-in-system-etc-prop.default.patch b/patches/platform_build/0002-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
index cc97661..da04fd7 100644
--- a/patches/platform_build/0002-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
+++ b/patches/platform_build/0002-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
@@ -9,7 +9,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index 0a2f6e39d0..059aa98c29 100644
+index 0a2f6e3..059aa98 100644
 --- a/core/Makefile
 +++ b/core/Makefile
 @@ -176,6 +176,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
@@ -21,5 +21,5 @@
  ifdef property_overrides_split_enabled
  	$(hide) mkdir -p $(TARGET_ROOT_OUT)
 -- 
-2.17.1
+2.7.4