Merge "[GPU Service] Name GPU service back to "gpu"" am: fa19959795
am: 4e0f3d8b14

Change-Id: I320b370222042708c2d7f60a0f68ee335c270da9