Merge "Switch to clang-4053586" am: 1923ed7f41
am: 7315435dce

Change-Id: Ide9ecce1c40f2af538c06df9aad1263aae22ae6b
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 5a89fc9..53bb111 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -186,7 +186,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 := 2017-04-05
+      PLATFORM_SECURITY_PATCH := 2017-07-05
 endif
 
 ifndef PLATFORM_BASE_OS