am 30a513a9: am cf45b615: Merge "Adding support for GLES3" into klp-dev

* commit '30a513a9515f62bf3dcdcb99f2ad588b48c0098e':
  Adding support for GLES3