Merge changes from topic 'oreolo' into android-8.0

* changes:
  sepolicy: nuke uncompatible policies for O bringup
  common: switch to PRODUCT_DEFAULT_PROPERTY_OVERRIDES
diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh
index 85566e2..ce3627f 100755
--- a/prebuilt/bin/backuptool.sh
+++ b/prebuilt/bin/backuptool.sh
@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=7.1
+export V=8.0
 
 # Preserve /system/addon.d in /tmp/addon.d
 preserve_addon_d() {