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