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

Change-Id: I2d3eeefa4155da4fe7f891b0e8be0baa3c612ea3