Merge "Remove use of npic image for gtests."
am: 69ed58348a

Change-Id: I47bde37da4b2e9d7e5e4cc3f3a8c79ec2bd6e816