Merge "Fix for CTS nativeopengl tests" into marshmallow-cts-dev am: be8e5f494e am: 6263b1ab1e am: d65b92fea3 am: d93d0c4ad8 am: 9e637d94a5 am: 088479ec60 am: 6b096d20ee am: e4c6b9a5ce am: ce1c6e4288 am: 238bf39b4d am: 58a7b2fa7e
am: 6c3584e612

Change-Id: Id842c42d05df5721f0339d314db7698315910fbf