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

Change-Id: I19f39d2e1425e28f4d9d51179d8cf334cd66da07