Merge "Merge "OpenGlEsVersionTest: require features to exactly match capabilities" into nougat-cts-dev am: fb665be985" into nougat-mr1-cts-dev
am: 79fec4de93

Change-Id: I16789c8bc5c9690b1f7c3b0a609cfb0109bd2a4a