Merge branch 'master' of sso://daydream-internal.git.corp.google.com/GoogleVR/GitHub/gvr-android-sdk