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

Change-Id: Ib8411be086ff1da30197c0772f042ba003755780