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

Change-Id: I8dca2b0af319d9e59548e00c5ee9f33ed390d19c