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

Change-Id: I9742bbcaa58dc4b99de394bef825921e163df478