Merge commit '259b30bb045db61df71246b8bfda9121a879afb0' of sso://googleplex-android/platform/external/gfxstream-protocols into HEAD
Change-Id: I411e40c817989c997c2f984763b2c9697812ee38