Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev