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