Merge "Fix the obsolete vkjson path in gpu services" into pi-dev
am: a991bc00d8

Change-Id: I3345843af86a9cb70ec1423e9fa70acb6cacdb3a