Merge "Merge "Add missing libraries to openglperf2 test cases." into marshmallow-cts-dev am: 2972d23273" into nougat-cts-dev am: eadf23254c am: 26ab1a0c57 am: 03b0052699
am: 9d1d92471e

Change-Id: I4effafbe9321267a32a330831aecad33d6c62df2