Merge "EntropyMixer: add ro.build.fingerprint to the mix"