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

Change-Id: I25804cef15170096f6258f8ec92cdef277702b80