Android 7.1.1 Release 41 (N4F27E)
Merge "Remove old opengl code and update references" into nyc-mr1-dev