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

Change-Id: I4d7ec2a6284a10f33697c2567f16916c3858b721