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

Change-Id: I3af5fa835de85906b1ab01e92856d93e82afb51c