Android 7.1.1 release 25
Merge "Remove old opengl code and update references" into nyc-mr1-dev