am 56ce3c00: Merge "Fix b/5821633: Could not activate GLEnvironment" into jb-dev

* commit '56ce3c00fb120133dbd706da8f550bc6ed9c3722':
  Fix b/5821633: Could not activate GLEnvironment