Merge "whitelist additional gpu ioctls" into nyc-dev