Merge "CDD: Correction to build parameters BASE_OS & SECURITY_PATCH." am: 0fc5bdedaf

Original change:

Change-Id: Id80e4e4e54dc8574978e20da5f003be146f73eaa
diff --git a/3_software/ b/3_software/
index 39a7937..3499db6 100644
--- a/3_software/
+++ b/3_software/
@@ -200,7 +200,7 @@
     except that it MUST NOT be null or the empty string ("").</td>
-    <td>SECURITY_PATCH</td>
     <td>A value indicating the security patch level of a build. It MUST signify
     that the build is not in any way vulnerable to any of the issues described
     up through the designated Android Public Security Bulletin. It MUST be in
@@ -210,7 +210,7 @@
     Android Security Advisory</a>, for example "2015-11-01".</td>
-    <td>BASE_OS</td>
+    <td>VERSION.BASE_OS</td>
     <td>A value representing the FINGERPRINT parameter of the build that is
     otherwise identical to this build except for the patches provided in the
     Android Public Security Bulletin. It MUST report the correct value and if