Updating with the latest version of the Giraffe.
Updating with the latest version of the Giraffe.

Tested on Linux and Android.

Change-Id: Ibecef1bc7c4a0e3a52269a5390abf28b6d583fe2

google/zooshi,google/zooshi,google/zooshi,google/zooshi,google/zooshi