Make change and version bump to OPM4.171019.016.A1

Change-Id: I008116f33d36430b0830d7f0887098b60359e56b
diff --git a/core/build_id.mk b/core/build_id.mk
index a1102dd..c8a6ddb 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=OPM4.171019.016
+export BUILD_ID=OPM4.171019.016.A1
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ba494ff..a15537e 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -181,7 +181,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-04-05
+      PLATFORM_SECURITY_PATCH := 2018-05-05
 endif
 
 ifndef PLATFORM_BASE_OS