Merge "Remove use of npic image for gtests."