Merge "Allow adbd to use graphics fds" am: 6f94c1d584
am: 7c35e243d3

Change-Id: I2de5f421ef7ecbb2954098615e31cefe3c88cff7