Merge "Changed droiddoc.mk to support Metalava annotations." into pi-dev

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6c5eac2..af45d44 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -231,7 +231,7 @@
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2018-07-05
+      PLATFORM_SECURITY_PATCH := 2018-08-05
 endif
 
 ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP

target/board/generic/sepolicy/vendor_init.te

diff --git a/target/board/generic/sepolicy/vendor_init.te b/target/board/generic/sepolicy/vendor_init.te
new file mode 100644
index 0000000..b18d391
--- /dev/null
+++ b/target/board/generic/sepolicy/vendor_init.te
@@ -0,0 +1 @@
+set_prop(vendor_init, qemu_prop)

target/product/go_defaults_common.mk

diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index ad5fe94..18907c1 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -22,7 +22,8 @@
      ro.lmk.critical_upgrade=true \
      ro.lmk.upgrade_pressure=40 \
      ro.lmk.downgrade_pressure=60 \
-     ro.lmk.kill_heaviest_task=false
+     ro.lmk.kill_heaviest_task=false \
+     ro.statsd.enable=false
 
 # set threshold to filter unused apps
 PRODUCT_PROPERTY_OVERRIDES += \