Make change and version bump to OPM2.171026.002

Change-Id: If2d707bca1e99488b1210ec673d3ff86f6339dae
diff --git a/core/build_id.mk b/core/build_id.mk
index 55c8358..8715cf9 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=OPM2.171019.028
+export BUILD_ID=OPM2.171026.002
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f03d9ba..ba494ff 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-03-05
+      PLATFORM_SECURITY_PATCH := 2018-04-05
 endif
 
 ifndef PLATFORM_BASE_OS