Merge "GlVboPerfTest: Fix libnativehelper dependency"