Merge "Add dependency on jni_headers to opengl tests" am: e65d87a96b am: 437b0af693 am: e329ede0fe

Change-Id: Id1cbd515f6fbafc4a4ef4b4f4acf97ad28f5e753