am 1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev

* commit '1e83690c6030b33c7776fa65cb57132d5e2d0b40':
  assert -eng builds when calling a GL function without a context