Merge "Don't set /dev/hwrng to O_NONBLOCK"