Merge cherrypicks of [16017025] into sc-release.

Change-Id: If87f3e57ef75990b4bd994ff1fd9e446c1dfd9d7
diff --git a/device.mk b/device.mk
index 567663f..d0fcfde 100644
--- a/device.mk
+++ b/device.mk
@@ -880,7 +880,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=34
+	ro.vendor.build.svn=35
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json