Merge "Rename gpu_work.o to gpuWork.o" into stage-aosp-master