Merge cherrypicks of [17113996] into sc-v2-release.

Change-Id: I07ed5791b84dc68993c5732fe1a9d475a58328e0
diff --git a/device.mk b/device.mk
index f686999..3ac623a 100644
--- a/device.mk
+++ b/device.mk
@@ -879,7 +879,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=56
+	ro.vendor.build.svn=57
 
 # Vendor verbose logging default property
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))