Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH"

This reverts commit 84df94cf1898a8115915b5248728671c41e479e4.

Change-Id: Ic9540d75f1c5543be818c6d0b54224f5fcf36bf4
2 files changed