Merge "Add dependency on jni_headers to opengl tests"