Merge "add dri device to zygote whitelisted FDs"