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