Merge changes I45836219,I70a4075e

* changes:
  Regenerate API/trace files for constness change
  Import constness fix from gl3.h into gl2.h.