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

Change-Id: If8cfdded40ea4d60814631bd2ecff117cfa51323