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

Change-Id: Ideb164d958843688bbde7f752acb28f9d735d0f2