am 0f69bc74: am 51a6d72b: am 88246ee7: am 59eaf921: Merge "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH" into mnc-dev

* commit '0f69bc74437f74d2cfb9e41208b7f0520fed66b2':
  Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH