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

Change-Id: I4507547bfa89f3ee139c5ddaf551e43af6706586