Merge "Use ro.build.fingerprint instead of ro.bootimage.*"