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

Change-Id: I3b2ec5c9160d0f5e51ba37e3c3488d779ae50cfd