Merge "core/Build: ro.system when comparing fingerprint"