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

Change-Id: I527f1ff7c5e9dda76ec36dbe6fb1d041e6a36437