Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d am: bfa93a9472

Change-Id: I79dce6f20d4bd7a8725ff17ac8b36132a02285f8