Merge "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH"" into mnc-dev