Merge "Update how drm file descriptors are passed through framework" into nyc-dev