Merge "OpenGL: fix initializeAnglePlatform with built-in ANGLE driver" am: f75a5aa19f am: 41f56f816a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1458682

Change-Id: I9b0aaa69a61c560a54d77b2516b738b44bcbd890