[automerger skipped] Replace Entropy with RAND_bytes
am: e489a0371e -s ours
am skip reason: change_id I579d140ef56c90b477b0d8989e3b02375681aee8 with SHA1 44d1afa2c0 is in history

Change-Id: I74743cd44bae566c2afc6ec708a50b6c3c13b05f