am d82cc1de: Merge "Fixup JNI" into ics-mr0

* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI
tree: 6af1e11c0fdf6c5b8c78257eced55a774e193e66
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE