Merge "Define gpu_service and allow surfaceflinger to provide it" into nyc-dev