Merge cherrypicks of [15749384, 15749385, 15749021, 15749367, 15749149, 15749150, 15749402, 15748246, 15748540, 15749368, 15749369, 15749386, 15749387, 15749403, 15749404] into sc-release

Change-Id: I4e58c9e81a4af001f4d672fb8460467f99193cb1
diff --git a/device.mk b/device.mk
index f449f08..28cff09 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=30
+	ro.vendor.build.svn=31
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json