Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev