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

Change-Id: I3ba39135d379650ea677995b83f129ed68ba9ae0